Commit 21d638ef authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer
Browse files

MIPS: TXX9: Remove rbtx4938 board support 



No active MIPS user own this board, so let's remove it.

Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
Reviewed-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Tested-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent f2c6c22f

arch/mips/configs/rbtx49xx_defconfig

+0 −2
Original line number Original line Diff line number Diff line
@@ -10,9 +10,7 @@ CONFIG_EXPERT=y 
CONFIG_SLAB=y

CONFIG_SLAB=y

CONFIG_MACH_TX49XX=y

CONFIG_MACH_TX49XX=y

CONFIG_TOSHIBA_RBTX4927=y

CONFIG_TOSHIBA_RBTX4927=y

CONFIG_TOSHIBA_RBTX4938=y

CONFIG_TOSHIBA_RBTX4939=y

CONFIG_TOSHIBA_RBTX4939=y

CONFIG_TOSHIBA_RBTX4938_MPLEX_KEEP=y

# CONFIG_SECCOMP is not set

# CONFIG_SECCOMP is not set

CONFIG_PCI=y

CONFIG_PCI=y

CONFIG_MODULES=y

CONFIG_MODULES=y

arch/mips/include/asm/txx9/boards.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -6,9 +6,6 @@ BOARD_VEC(jmr3927_vec) 
BOARD_VEC(rbtx4927_vec)

BOARD_VEC(rbtx4927_vec)

BOARD_VEC(rbtx4937_vec)

BOARD_VEC(rbtx4937_vec)

#endif

#endif

#ifdef CONFIG_TOSHIBA_RBTX4938

BOARD_VEC(rbtx4938_vec)

#endif

#ifdef CONFIG_TOSHIBA_RBTX4939

#ifdef CONFIG_TOSHIBA_RBTX4939

BOARD_VEC(rbtx4939_vec)

BOARD_VEC(rbtx4939_vec)

#endif
 
#endif

arch/mips/include/asm/txx9/rbtx4938.h

deleted100644 → 0
+0 −145
Original line number Original line Diff line number Diff line 
/*

 * Definitions for TX4937/TX4938

 *

 * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the

 * terms of the GNU General Public License version 2. This program is

 * licensed "as is" without any warranty of any kind, whether express

 * or implied.

 *

 * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)

 */

#ifndef __ASM_TXX9_RBTX4938_H

#define __ASM_TXX9_RBTX4938_H



#include <asm/addrspace.h>

#include <asm/txx9irq.h>

#include <asm/txx9/tx4938.h>



/* Address map */

#define RBTX4938_FPGA_REG_ADDR	(IO_BASE + TXX9_CE(2) + 0x00000000)

#define RBTX4938_FPGA_REV_ADDR	(IO_BASE + TXX9_CE(2) + 0x00000002)

#define RBTX4938_CONFIG1_ADDR	(IO_BASE + TXX9_CE(2) + 0x00000004)

#define RBTX4938_CONFIG2_ADDR	(IO_BASE + TXX9_CE(2) + 0x00000006)

#define RBTX4938_CONFIG3_ADDR	(IO_BASE + TXX9_CE(2) + 0x00000008)

#define RBTX4938_LED_ADDR	(IO_BASE + TXX9_CE(2) + 0x00001000)

#define RBTX4938_DIPSW_ADDR	(IO_BASE + TXX9_CE(2) + 0x00001002)

#define RBTX4938_BDIPSW_ADDR	(IO_BASE + TXX9_CE(2) + 0x00001004)

#define RBTX4938_IMASK_ADDR	(IO_BASE + TXX9_CE(2) + 0x00002000)

#define RBTX4938_IMASK2_ADDR	(IO_BASE + TXX9_CE(2) + 0x00002002)

#define RBTX4938_INTPOL_ADDR	(IO_BASE + TXX9_CE(2) + 0x00002004)

#define RBTX4938_ISTAT_ADDR	(IO_BASE + TXX9_CE(2) + 0x00002006)

#define RBTX4938_ISTAT2_ADDR	(IO_BASE + TXX9_CE(2) + 0x00002008)

#define RBTX4938_IMSTAT_ADDR	(IO_BASE + TXX9_CE(2) + 0x0000200a)

#define RBTX4938_IMSTAT2_ADDR	(IO_BASE + TXX9_CE(2) + 0x0000200c)

#define RBTX4938_SOFTINT_ADDR	(IO_BASE + TXX9_CE(2) + 0x00003000)

#define RBTX4938_PIOSEL_ADDR	(IO_BASE + TXX9_CE(2) + 0x00005000)

#define RBTX4938_SPICS_ADDR	(IO_BASE + TXX9_CE(2) + 0x00005002)

#define RBTX4938_SFPWR_ADDR	(IO_BASE + TXX9_CE(2) + 0x00005008)

#define RBTX4938_SFVOL_ADDR	(IO_BASE + TXX9_CE(2) + 0x0000500a)

#define RBTX4938_SOFTRESET_ADDR (IO_BASE + TXX9_CE(2) + 0x00007000)

#define RBTX4938_SOFTRESETLOCK_ADDR	(IO_BASE + TXX9_CE(2) + 0x00007002)

#define RBTX4938_PCIRESET_ADDR	(IO_BASE + TXX9_CE(2) + 0x00007004)

#define RBTX4938_ETHER_BASE	(IO_BASE + TXX9_CE(2) + 0x00020000)



/* Ethernet port address (Jumperless Mode (W12:Open)) */

#define RBTX4938_ETHER_ADDR	(RBTX4938_ETHER_BASE + 0x280)



/* bits for ISTAT/IMASK/IMSTAT */

#define RBTX4938_INTB_PCID	0

#define RBTX4938_INTB_PCIC	1

#define RBTX4938_INTB_PCIB	2

#define RBTX4938_INTB_PCIA	3

#define RBTX4938_INTB_RTC	4

#define RBTX4938_INTB_ATA	5

#define RBTX4938_INTB_MODEM	6

#define RBTX4938_INTB_SWINT	7

#define RBTX4938_INTF_PCID	(1 << RBTX4938_INTB_PCID)

#define RBTX4938_INTF_PCIC	(1 << RBTX4938_INTB_PCIC)

#define RBTX4938_INTF_PCIB	(1 << RBTX4938_INTB_PCIB)

#define RBTX4938_INTF_PCIA	(1 << RBTX4938_INTB_PCIA)

#define RBTX4938_INTF_RTC	(1 << RBTX4938_INTB_RTC)

#define RBTX4938_INTF_ATA	(1 << RBTX4938_INTB_ATA)

#define RBTX4938_INTF_MODEM	(1 << RBTX4938_INTB_MODEM)

#define RBTX4938_INTF_SWINT	(1 << RBTX4938_INTB_SWINT)



#define rbtx4938_fpga_rev_addr	((__u8 __iomem *)RBTX4938_FPGA_REV_ADDR)

#define rbtx4938_led_addr	((__u8 __iomem *)RBTX4938_LED_ADDR)

#define rbtx4938_dipsw_addr	((__u8 __iomem *)RBTX4938_DIPSW_ADDR)

#define rbtx4938_bdipsw_addr	((__u8 __iomem *)RBTX4938_BDIPSW_ADDR)

#define rbtx4938_imask_addr	((__u8 __iomem *)RBTX4938_IMASK_ADDR)

#define rbtx4938_imask2_addr	((__u8 __iomem *)RBTX4938_IMASK2_ADDR)

#define rbtx4938_intpol_addr	((__u8 __iomem *)RBTX4938_INTPOL_ADDR)

#define rbtx4938_istat_addr	((__u8 __iomem *)RBTX4938_ISTAT_ADDR)

#define rbtx4938_istat2_addr	((__u8 __iomem *)RBTX4938_ISTAT2_ADDR)

#define rbtx4938_imstat_addr	((__u8 __iomem *)RBTX4938_IMSTAT_ADDR)

#define rbtx4938_imstat2_addr	((__u8 __iomem *)RBTX4938_IMSTAT2_ADDR)

#define rbtx4938_softint_addr	((__u8 __iomem *)RBTX4938_SOFTINT_ADDR)

#define rbtx4938_piosel_addr	((__u8 __iomem *)RBTX4938_PIOSEL_ADDR)

#define rbtx4938_spics_addr	((__u8 __iomem *)RBTX4938_SPICS_ADDR)

#define rbtx4938_sfpwr_addr	((__u8 __iomem *)RBTX4938_SFPWR_ADDR)

#define rbtx4938_sfvol_addr	((__u8 __iomem *)RBTX4938_SFVOL_ADDR)

#define rbtx4938_softreset_addr ((__u8 __iomem *)RBTX4938_SOFTRESET_ADDR)

#define rbtx4938_softresetlock_addr	\

				((__u8 __iomem *)RBTX4938_SOFTRESETLOCK_ADDR)

#define rbtx4938_pcireset_addr	((__u8 __iomem *)RBTX4938_PCIRESET_ADDR)



/*

 * IRQ mappings

 */



#define RBTX4938_SOFT_INT0	0	/* not used */

#define RBTX4938_SOFT_INT1	1	/* not used */

#define RBTX4938_IRC_INT	2

#define RBTX4938_TIMER_INT	7



/* These are the virtual IRQ numbers, we divide all IRQ's into

 * 'spaces', the 'space' determines where and how to enable/disable

 * that particular IRQ on an RBTX4938 machine.	Add new 'spaces' as new

 * IRQ hardware is supported.

 */

#define RBTX4938_NR_IRQ_IOC	8



#define RBTX4938_IRQ_IRC	TXX9_IRQ_BASE

#define RBTX4938_IRQ_IOC	(TXX9_IRQ_BASE + TX4938_NUM_IR)

#define RBTX4938_IRQ_END	(RBTX4938_IRQ_IOC + RBTX4938_NR_IRQ_IOC)



#define RBTX4938_IRQ_IRC_ECCERR (RBTX4938_IRQ_IRC + TX4938_IR_ECCERR)

#define RBTX4938_IRQ_IRC_WTOERR (RBTX4938_IRQ_IRC + TX4938_IR_WTOERR)

#define RBTX4938_IRQ_IRC_INT(n) (RBTX4938_IRQ_IRC + TX4938_IR_INT(n))

#define RBTX4938_IRQ_IRC_SIO(n) (RBTX4938_IRQ_IRC + TX4938_IR_SIO(n))

#define RBTX4938_IRQ_IRC_DMA(ch, n)	(RBTX4938_IRQ_IRC + TX4938_IR_DMA(ch, n))

#define RBTX4938_IRQ_IRC_PIO	(RBTX4938_IRQ_IRC + TX4938_IR_PIO)

#define RBTX4938_IRQ_IRC_PDMAC	(RBTX4938_IRQ_IRC + TX4938_IR_PDMAC)

#define RBTX4938_IRQ_IRC_PCIC	(RBTX4938_IRQ_IRC + TX4938_IR_PCIC)

#define RBTX4938_IRQ_IRC_TMR(n) (RBTX4938_IRQ_IRC + TX4938_IR_TMR(n))

#define RBTX4938_IRQ_IRC_NDFMC	(RBTX4938_IRQ_IRC + TX4938_IR_NDFMC)

#define RBTX4938_IRQ_IRC_PCIERR (RBTX4938_IRQ_IRC + TX4938_IR_PCIERR)

#define RBTX4938_IRQ_IRC_PCIPME (RBTX4938_IRQ_IRC + TX4938_IR_PCIPME)

#define RBTX4938_IRQ_IRC_ACLC	(RBTX4938_IRQ_IRC + TX4938_IR_ACLC)

#define RBTX4938_IRQ_IRC_ACLCPME	(RBTX4938_IRQ_IRC + TX4938_IR_ACLCPME)

#define RBTX4938_IRQ_IRC_PCIC1	(RBTX4938_IRQ_IRC + TX4938_IR_PCIC1)

#define RBTX4938_IRQ_IRC_SPI	(RBTX4938_IRQ_IRC + TX4938_IR_SPI)

#define RBTX4938_IRQ_IOC_PCID	(RBTX4938_IRQ_IOC + RBTX4938_INTB_PCID)

#define RBTX4938_IRQ_IOC_PCIC	(RBTX4938_IRQ_IOC + RBTX4938_INTB_PCIC)

#define RBTX4938_IRQ_IOC_PCIB	(RBTX4938_IRQ_IOC + RBTX4938_INTB_PCIB)

#define RBTX4938_IRQ_IOC_PCIA	(RBTX4938_IRQ_IOC + RBTX4938_INTB_PCIA)

#define RBTX4938_IRQ_IOC_RTC	(RBTX4938_IRQ_IOC + RBTX4938_INTB_RTC)

#define RBTX4938_IRQ_IOC_ATA	(RBTX4938_IRQ_IOC + RBTX4938_INTB_ATA)

#define RBTX4938_IRQ_IOC_MODEM	(RBTX4938_IRQ_IOC + RBTX4938_INTB_MODEM)

#define RBTX4938_IRQ_IOC_SWINT	(RBTX4938_IRQ_IOC + RBTX4938_INTB_SWINT)





/* IOC (PCI, etc) */

#define RBTX4938_IRQ_IOCINT	(TXX9_IRQ_BASE + TX4938_IR_INT(0))

/* Onboard 10M Ether */

#define RBTX4938_IRQ_ETHER	(TXX9_IRQ_BASE + TX4938_IR_INT(1))



#define RBTX4938_RTL_8019_BASE (RBTX4938_ETHER_ADDR - mips_io_port_base)

#define RBTX4938_RTL_8019_IRQ  (RBTX4938_IRQ_ETHER)



void rbtx4938_prom_init(void);

void rbtx4938_irq_setup(void);

struct pci_dev;

int rbtx4938_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin);



#endif /* __ASM_TXX9_RBTX4938_H */

arch/mips/include/asm/txx9/spi.h

deleted100644 → 0
+0 −34
Original line number Original line Diff line number Diff line 
/*

 * Definitions for TX4937/TX4938 SPI

 *

 * Copyright (C) 2000-2001 Toshiba Corporation

 *

 * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the

 * terms of the GNU General Public License version 2. This program is

 * licensed "as is" without any warranty of any kind, whether express

 * or implied.

 *

 * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)

 */

#ifndef __ASM_TXX9_SPI_H

#define __ASM_TXX9_SPI_H



#include <linux/errno.h>



#ifdef CONFIG_SPI

int spi_eeprom_register(int busid, int chipid, int size);

int spi_eeprom_read(int busid, int chipid,

		    int address, unsigned char *buf, int len);

#else

static inline int spi_eeprom_register(int busid, int chipid, int size)

{

	return -ENODEV;

}

static inline int spi_eeprom_read(int busid, int chipid,

				  int address, unsigned char *buf, int len)

{

	return -ENODEV;

}

#endif



#endif /* __ASM_TXX9_SPI_H */

arch/mips/pci/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,6 @@ obj-$(CONFIG_SOC_TX4927) += pci-tx4927.o 
obj-$(CONFIG_SOC_TX4938)	+= pci-tx4938.o

obj-$(CONFIG_SOC_TX4938)	+= pci-tx4938.o

obj-$(CONFIG_SOC_TX4939)	+= pci-tx4939.o

obj-$(CONFIG_SOC_TX4939)	+= pci-tx4939.o

obj-$(CONFIG_TOSHIBA_RBTX4927)	+= fixup-rbtx4927.o

obj-$(CONFIG_TOSHIBA_RBTX4927)	+= fixup-rbtx4927.o

obj-$(CONFIG_TOSHIBA_RBTX4938)	+= fixup-rbtx4938.o

obj-$(CONFIG_VICTOR_MPC30X)	+= fixup-mpc30x.o

obj-$(CONFIG_VICTOR_MPC30X)	+= fixup-mpc30x.o

obj-$(CONFIG_ZAO_CAPCELLA)	+= fixup-capcella.o

obj-$(CONFIG_ZAO_CAPCELLA)	+= fixup-capcella.o

obj-$(CONFIG_MIKROTIK_RB532)	+= pci-rc32434.o ops-rc32434.o fixup-rc32434.o

obj-$(CONFIG_MIKROTIK_RB532)	+= pci-rc32434.o ops-rc32434.o fixup-rc32434.o