Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

7e2225d8 · Linus Torvalds <[email protected]> · 2008-07-15 15:01:29 -07:00

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (54 commits)
  [MIPS] Remove mips_machtype for LASAT machines
  [MIPS] Remove mips_machtype from EMMA2RH machines
  [MIPS] Remove mips_machtype from ARC based machines
  [MIPS] MTX-1 flash partition setup move to platform devices registration
  [MIPS] TXx9: cleanup and fix some sparse warnings
  [MIPS] TXx9: rename asm-mips/mach-jmr3927 to asm-mips/mach-tx39xx
  [MIPS] remove machtype for group Toshiba
  [MIPS] separate rbtx4927_time_init() and rbtx4937_time_init()
  [MIPS] separate rbtx4927_arch_init() and rbtx4937_arch_init()
  [MIPS] txx9_cpu_clock setup move to rbtx4927_time_init()
  [MIPS] txx9_board_vec set directly without mips_machtype
  [MIPS] IP22: Add platform device for Indy volume buttons
  [MIPS] cmbvr4133: Remove support
  [MIPS] remove wrppmc_machine_power_off()
  [MIPS] replace inline assembler to cpu_wait()
  [MIPS] IP22/28: Add platform devices for HAL2
  [MIPS] TXx9: Update and merge defconfigs
  [MIPS] TXx9: Make single kernel can support multiple boards
  [MIPS] TXx9: Update defconfigs
  [MIPS] TXx9: Reorganize PCI code
  ...

Commit: 7e2225d860772aaa07e1cebca6a5aa6f93f9aa91
Parents: 3a628b0f · b27418aa

Merge commit. Changes below are compared with the first parent: 3a628b0f.

Changes

215 files changed · +4093 −15417

File	Status	Add	Del	Content
arch/mips/Kconfig	modified	+10	−120	View file
arch/mips/Makefile	modified	+16	−43	View file
arch/mips/au1000/common/platform.c	modified	+15	−14	View file
arch/mips/au1000/mtx-1/platform.c	modified	+50	−1	View file
arch/mips/au1000/pb1200/platform.c	modified	+3	−2	View file
arch/mips/cobalt/Makefile	modified	+1	−1	View file
arch/mips/cobalt/lcd.c	added	+55	−0	View file
arch/mips/configs/atlas_defconfig	deleted	+0	−1472	View before deletion
arch/mips/configs/bcm47xx_defconfig	modified	+0	−2	View file
arch/mips/configs/bigsur_defconfig	modified	+104	−60	View file
arch/mips/configs/capcella_defconfig	modified	+0	−2	View file
arch/mips/configs/cobalt_defconfig	modified	+0	−2	View file
arch/mips/configs/db1000_defconfig	modified	+0	−2	View file
arch/mips/configs/db1100_defconfig	modified	+0	−2	View file
arch/mips/configs/db1200_defconfig	modified	+0	−2	View file
arch/mips/configs/db1500_defconfig	modified	+0	−2	View file
arch/mips/configs/db1550_defconfig	modified	+0	−2	View file
arch/mips/configs/decstation_defconfig	modified	+0	−2	View file
arch/mips/configs/e55_defconfig	modified	+0	−2	View file
arch/mips/configs/emma2rh_defconfig	modified	+0	−2	View file
arch/mips/configs/excite_defconfig	modified	+0	−2	View file
arch/mips/configs/fulong_defconfig	modified	+0	−2	View file
arch/mips/configs/ip22_defconfig	modified	+0	−2	View file
arch/mips/configs/ip27_defconfig	modified	+0	−2	View file
arch/mips/configs/ip28_defconfig	modified	+0	−2	View file
arch/mips/configs/ip32_defconfig	modified	+0	−2	View file
arch/mips/configs/jazz_defconfig	modified	+0	−2	View file
arch/mips/configs/jmr3927_defconfig	modified	+122	−68	View file
arch/mips/configs/lasat_defconfig	modified	+0	−2	View file
arch/mips/configs/malta_defconfig	modified	+0	−3	View file
arch/mips/configs/mipssim_defconfig	modified	+0	−2	View file
arch/mips/configs/mpc30x_defconfig	modified	+0	−2	View file
arch/mips/configs/msp71xx_defconfig	modified	+0	−2	View file
arch/mips/configs/mtx1_defconfig	modified	+0	−2	View file
arch/mips/configs/pb1100_defconfig	modified	+0	−2	View file
arch/mips/configs/pb1500_defconfig	modified	+0	−2	View file
arch/mips/configs/pb1550_defconfig	modified	+0	−2	View file
arch/mips/configs/pnx8550-jbs_defconfig	modified	+0	−2	View file
arch/mips/configs/pnx8550-stb810_defconfig	modified	+0	−2	View file
arch/mips/configs/rbhma4500_defconfig	deleted	+0	−701	View before deletion
arch/mips/configs/rbhma4200_defconfig → arch/mips/configs/rbtx49xx_defconfig	renamed	+171	−73	View file
arch/mips/configs/rm200_defconfig	modified	+0	−2	View file
arch/mips/configs/sb1250-swarm_defconfig	modified	+0	−2	View file
arch/mips/configs/sead_defconfig	deleted	+0	−642	View before deletion
arch/mips/configs/tb0219_defconfig	modified	+0	−2	View file
arch/mips/configs/tb0226_defconfig	modified	+0	−2	View file
arch/mips/configs/tb0287_defconfig	modified	+0	−2	View file
arch/mips/configs/workpad_defconfig	modified	+0	−2	View file
arch/mips/configs/wrppmc_defconfig	modified	+0	−2	View file
arch/mips/configs/yosemite_defconfig	modified	+0	−2	View file
arch/mips/emma2rh/common/prom.c	modified	+7	−8	View file
arch/mips/fw/arc/identify.c	modified	+0	−11	View file
arch/mips/gt64120/wrppmc/reset.c	modified	+4	−10	View file
arch/mips/gt64120/wrppmc/setup.c	modified	+1	−2	View file
arch/mips/jazz/setup.c	modified	+1	−3	View file
arch/mips/jmr3927/common/Makefile	deleted	+0	−7	View before deletion
arch/mips/jmr3927/common/prom.c	deleted	+0	−72	View before deletion
arch/mips/jmr3927/rbhma3100/init.c	deleted	+0	−57	View before deletion
arch/mips/kernel/Makefile	modified	+1	−5	View file
arch/mips/kernel/early_printk.c	modified	+2	−0	View file
arch/mips/kernel/gpio_txx9.c	modified	+6	−4	View file
arch/mips/kernel/i8253.c	modified	+1	−1	View file
arch/mips/kernel/irix5sys.S	deleted	+0	−1041	View before deletion
arch/mips/kernel/irixelf.c	deleted	+0	−1361	View before deletion
arch/mips/kernel/irixinv.c	deleted	+0	−78	View before deletion
arch/mips/kernel/irixioctl.c	deleted	+0	−213	View before deletion
arch/mips/kernel/irixsig.c	deleted	+0	−888	View before deletion
arch/mips/kernel/irq.c	modified	+0	−4	View file
arch/mips/kernel/mips-mt.c	modified	+5	−6	View file
arch/mips/kernel/process.c	modified	+0	−7	View file
arch/mips/kernel/scall32-o32.S	modified	+0	−19	View file
arch/mips/kernel/setup.c	modified	+1	−12	View file
arch/mips/kernel/sysirix.c	deleted	+0	−2140	View before deletion
arch/mips/kernel/traps.c	modified	+4	−10	View file
arch/mips/lasat/interrupt.c	modified	+8	−13	View file
arch/mips/lasat/lasat_board.c	modified	+1	−2	View file
arch/mips/lasat/prom.c	modified	+3	−5	View file
arch/mips/lasat/serial.c	modified	+1	−2	View file
arch/mips/lasat/setup.c	modified	+5	−3	View file
arch/mips/mips-boards/atlas/Makefile	deleted	+0	−22	View before deletion
arch/mips/mips-boards/atlas/atlas_gdb.c	deleted	+0	−97	View before deletion
arch/mips/mips-boards/atlas/atlas_int.c	deleted	+0	−272	View before deletion
arch/mips/mips-boards/atlas/atlas_setup.c	deleted	+0	−82	View before deletion
arch/mips/mips-boards/generic/Makefile	deleted	+0	−29	View before deletion
arch/mips/mips-boards/malta/Makefile	deleted	+0	−27	View before deletion
arch/mips/mips-boards/sead/Makefile	deleted	+0	−28	View before deletion
arch/mips/mips-boards/sead/sead_int.c	deleted	+0	−117	View before deletion
arch/mips/mips-boards/sead/sead_setup.c	deleted	+0	−77	View before deletion
arch/mips/mm/uasm.c	modified	+2	−2	View file
arch/mips/mm/uasm.h	modified	+0	−2	View file
arch/mips/mti-malta/Makefile	added	+21	−0	View file
arch/mips/mips-boards/generic/amon.c → arch/mips/mti-malta/malta-amon.c	renamed	+0	−0	View file
arch/mips/mips-boards/generic/cmdline.c → arch/mips/mti-malta/malta-cmdline.c	renamed	+0	−0	View file
arch/mips/mips-boards/generic/console.c → arch/mips/mti-malta/malta-console.c	renamed	+0	−21	View file
arch/mips/mips-boards/generic/display.c → arch/mips/mti-malta/malta-display.c	renamed	+1	−0	View file
arch/mips/mips-boards/generic/init.c → arch/mips/mti-malta/malta-init.c	renamed	+0	−12	View file
arch/mips/mips-boards/malta/malta_int.c → arch/mips/mti-malta/malta-int.c	renamed	+7	−4	View file
arch/mips/mips-boards/generic/gdb_hook.c → arch/mips/mti-malta/malta-kgdb.c	renamed	+0	−0	View file
arch/mips/mips-boards/generic/memory.c → arch/mips/mti-malta/malta-memory.c	renamed	+0	−6	View file
arch/mips/mips-boards/malta/malta_mtd.c → arch/mips/mti-malta/malta-mtd.c	renamed	+0	−0	View file
arch/mips/mips-boards/generic/pci.c → arch/mips/mti-malta/malta-pci.c	renamed	+0	−0	View file
arch/mips/mips-boards/malta/malta_platform.c → arch/mips/mti-malta/malta-platform.c	renamed	+0	−0	View file
arch/mips/mips-boards/generic/reset.c → arch/mips/mti-malta/malta-reset.c	renamed	+0	−19	View file
arch/mips/mips-boards/malta/malta_setup.c → arch/mips/mti-malta/malta-setup.c	renamed	+0	−0	View file
arch/mips/mips-boards/malta/malta_smtc.c → arch/mips/mti-malta/malta-smtc.c	renamed	+0	−0	View file
arch/mips/mips-boards/generic/time.c → arch/mips/mti-malta/malta-time.c	renamed	+0	−23	View file
arch/mips/nxp/pnx8550/common/platform.c	modified	+5	−4	View file
arch/mips/pci/Makefile	modified	+7	−6	View file
arch/mips/pci/fixup-atlas.c	deleted	+0	−91	View before deletion
arch/mips/pci/fixup-jmr3927.c	modified	+11	−24	View file
arch/mips/pci/fixup-rbtx4927.c	modified	+26	−93	View file
arch/mips/pci/fixup-tx4938.c → arch/mips/pci/fixup-rbtx4938.c	renamed	+12	−51	View file
arch/mips/pci/fixup-vr4133.c	deleted	+0	−195	View before deletion
arch/mips/pci/ops-mace.c	modified	+7	−0	View file
arch/mips/pci/ops-tx3927.c	modified	+80	−7	View file
arch/mips/pci/ops-tx4927.c	modified	+358	−159	View file
arch/mips/pci/ops-tx4938.c	deleted	+0	−214	View before deletion
arch/mips/pci/pci-bcm1480.c	modified	+0	−3	View file
arch/mips/pci/pci-ip27.c	modified	+0	−1	View file
arch/mips/pci/pci-jmr3927.c	deleted	+0	−58	View before deletion
arch/mips/pci/pci-lasat.c	modified	+4	−10	View file
arch/mips/pci/pci-sb1250.c	modified	+0	−4	View file
arch/mips/pci/pci-tx4927.c	added	+83	−0	View file
arch/mips/pci/pci-tx4938.c	added	+134	−0	View file
arch/mips/pci/pci.c	modified	+1	−2	View file
arch/mips/sgi-ip22/ip22-mc.c	modified	+26	−0	View file
arch/mips/sgi-ip22/ip22-platform.c	modified	+18	−0	View file
arch/mips/sgi-ip22/ip22-reset.c	modified	+2	−49	View file
arch/mips/sgi-ip22/ip28-berr.c	modified	+2	−2	View file
arch/mips/sgi-ip27/ip27-nmi.c	modified	+3	−7	View file
arch/mips/sgi-ip32/ip32-platform.c	modified	+36	−0	View file
arch/mips/sni/setup.c	modified	+0	−1	View file
arch/mips/tx4927/Kconfig	deleted	+0	−3	View before deletion
arch/mips/tx4927/common/Makefile	deleted	+0	−10	View before deletion
arch/mips/tx4927/toshiba_rbtx4927/Makefile	deleted	+0	−5	View before deletion
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c	deleted	+0	−94	View before deletion
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c	deleted	+0	−1001	View before deletion
arch/mips/tx4938/Kconfig	deleted	+0	−24	View before deletion
arch/mips/tx4938/common/Makefile	deleted	+0	−8	View before deletion
arch/mips/tx4938/toshiba_rbtx4938/setup.c	deleted	+0	−1124	View before deletion
arch/mips/txx9/Kconfig	added	+115	−0	View file
arch/mips/txx9/generic/Makefile	added	+12	−0	View file
arch/mips/tx4938/common/dbgio.c → arch/mips/txx9/generic/dbgio.c	renamed	+0	−0	View file
arch/mips/tx4927/common/tx4927_irq.c → arch/mips/txx9/generic/irq_tx4927.c	renamed	+3	−31	View file
arch/mips/tx4938/common/irq.c → arch/mips/txx9/generic/irq_tx4938.c	renamed	+4	−27	View file
arch/mips/tx4927/common/tx4927_prom.c → arch/mips/txx9/generic/mem_tx4927.c	renamed	+2	−7	View file
arch/mips/tx4938/common/prom.c → arch/mips/txx9/generic/mem_tx4938.c	renamed	+0	−0	View file
arch/mips/txx9/generic/pci.c	added	+388	−0	View file
arch/mips/txx9/generic/setup.c	added	+212	−0	View file
arch/mips/tx4927/common/smsc_fdc37m81x.c → arch/mips/txx9/generic/smsc_fdc37m81x.c	renamed	+1	−1	View file
arch/mips/jmr3927/rbhma3100/Makefile → arch/mips/txx9/jmr3927/Makefile	renamed	+2	−2	View file
arch/mips/jmr3927/rbhma3100/irq.c → arch/mips/txx9/jmr3927/irq.c	renamed	+23	−26	View file
arch/mips/jmr3927/rbhma3100/kgdb_io.c → arch/mips/txx9/jmr3927/kgdb_io.c	renamed	+1	−1	View file
arch/mips/jmr3927/common/puts.c → arch/mips/txx9/jmr3927/prom.c	renamed	+23	−7	View file
arch/mips/jmr3927/rbhma3100/setup.c → arch/mips/txx9/jmr3927/setup.c	renamed	+49	−119	View file
arch/mips/txx9/rbtx4927/Makefile	added	+3	−0	View file
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c → arch/mips/txx9/rbtx4927/irq.c	renamed	+34	−263	View file
arch/mips/tx4927/common/tx4927_dbgio.c → arch/mips/txx9/rbtx4927/prom.c	renamed	+14	−15	View file
arch/mips/txx9/rbtx4927/setup.c	added	+443	−0	View file
arch/mips/tx4938/toshiba_rbtx4938/Makefile → arch/mips/txx9/rbtx4938/Makefile	renamed	+0	−4	View file
arch/mips/tx4938/toshiba_rbtx4938/irq.c → arch/mips/txx9/rbtx4938/irq.c	renamed	+30	−22	View file
arch/mips/tx4938/toshiba_rbtx4938/prom.c → arch/mips/txx9/rbtx4938/prom.c	renamed	+3	−48	View file
arch/mips/txx9/rbtx4938/setup.c	added	+625	−0	View file
arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c → arch/mips/txx9/rbtx4938/spi_eeprom.c	renamed	+2	−2	View file
arch/mips/vr41xx/Kconfig	modified	+0	−17	View file
arch/mips/vr41xx/nec-cmbvr4133/Makefile	deleted	+0	−8	View before deletion
arch/mips/vr41xx/nec-cmbvr4133/init.c	deleted	+0	−65	View before deletion
arch/mips/vr41xx/nec-cmbvr4133/irq.c	deleted	+0	−46	View before deletion
arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c	deleted	+0	−249	View before deletion
arch/mips/vr41xx/nec-cmbvr4133/setup.c	deleted	+0	−89	View before deletion
drivers/mtd/maps/Kconfig	modified	+0	−7	View file
drivers/mtd/maps/Makefile	modified	+0	−1	View file
drivers/mtd/maps/mtx-1_flash.c	deleted	+0	−95	View before deletion
include/asm-mips/barrier.h	modified	+14	−0	View file
include/asm-mips/bitops.h	modified	+3	−3	View file
include/asm-mips/bootinfo.h	modified	+0	−43	View file
include/asm-mips/cpu.h	modified	+2	−2	View file
include/asm-mips/dec/kn05.h	modified	+5	−4	View file
include/asm-mips/inventory.h	deleted	+0	−24	View before deletion
include/asm-mips/io.h	modified	+0	−17	View file
include/asm-mips/lasat/lasat.h	modified	+2	−0	View file
include/asm-mips/mach-atlas/mc146818rtc.h	deleted	+0	−60	View before deletion
include/asm-mips/mach-db1x00/db1x00.h	modified	+0	−45	View file
include/asm-mips/mach-mips/cpu-feature-overrides.h → include/asm-mips/mach-malta/cpu-feature-overrides.h	renamed	+0	−0	View file
include/asm-mips/mach-mips/irq.h → include/asm-mips/mach-malta/irq.h	renamed	+0	−0	View file
include/asm-mips/mach-mips/kernel-entry-init.h → include/asm-mips/mach-malta/kernel-entry-init.h	renamed	+0	−0	View file
include/asm-mips/mach-mips/mach-gt64120.h → include/asm-mips/mach-malta/mach-gt64120.h	renamed	+0	−0	View file
include/asm-mips/mach-mips/mc146818rtc.h → include/asm-mips/mach-malta/mc146818rtc.h	renamed	+0	−0	View file
include/asm-mips/mach-mips/war.h → include/asm-mips/mach-malta/war.h	renamed	+0	−0	View file
include/asm-mips/mach-jmr3927/ioremap.h → include/asm-mips/mach-tx39xx/ioremap.h	renamed	+4	−4	View file
include/asm-mips/mach-jmr3927/mangle-port.h → include/asm-mips/mach-tx39xx/mangle-port.h	renamed	+9	−4	View file
include/asm-mips/mach-jmr3927/war.h → include/asm-mips/mach-tx39xx/war.h	renamed	+3	−3	View file
include/asm-mips/mach-vr41xx/irq.h	modified	+0	−3	View file
include/asm-mips/mips-boards/generic.h	modified	+0	−9	View file
include/asm-mips/namei.h	modified	+5	−20	View file
include/asm-mips/pci.h	modified	+3	−0	View file
include/asm-mips/prctl.h	deleted	+0	−41	View before deletion
include/asm-mips/setup.h	modified	+2	−0	View file
include/asm-mips/signal.h	modified	+0	−3	View file
include/asm-mips/traps.h	modified	+0	−1	View file
include/asm-mips/tx4927/tx4927.h	deleted	+0	−46	View before deletion
include/asm-mips/tx4927/tx4927_pci.h	deleted	+0	−268	View before deletion
include/asm-mips/txx9/generic.h	added	+41	−0	View file
include/asm-mips/jmr3927/jmr3927.h → include/asm-mips/txx9/jmr3927.h	renamed	+9	−4	View file
include/asm-mips/txx9/pci.h	added	+36	−0	View file
include/asm-mips/tx4927/toshiba_rbtx4927.h → include/asm-mips/txx9/rbtx4927.h	renamed	+39	−13	View file
include/asm-mips/tx4938/rbtx4938.h → include/asm-mips/txx9/rbtx4938.h	renamed	+13	−32	View file
include/asm-mips/tx4927/smsc_fdc37m81x.h → include/asm-mips/txx9/smsc_fdc37m81x.h	renamed	+0	−2	View file
include/asm-mips/tx4938/spi.h → include/asm-mips/txx9/spi.h	renamed	+3	−4	View file
include/asm-mips/jmr3927/tx3927.h → include/asm-mips/txx9/tx3927.h	renamed	+8	−4	View file
include/asm-mips/txx9/tx4927.h	added	+219	−0	View file
include/asm-mips/txx9/tx4927pcic.h	added	+199	−0	View file
include/asm-mips/tx4938/tx4938.h → include/asm-mips/txx9/tx4938.h	renamed	+38	−201	View file
include/asm-mips/jmr3927/txx927.h → include/asm-mips/txx9/txx927.h	renamed	+3	−3	View file
include/asm-mips/vr41xx/cmbvr4133.h	deleted	+0	−56	View before deletion

Only the first 600 diff lines are shown. Download the complete patch.

arch/mips/Kconfig

View file

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index d2be3ff..d21df5f 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -181,38 +181,6 @@ config LEMOTE_FULONG
 	  Lemote Fulong mini-PC board based on the Chinese Loongson-2E CPU and
 	  an FPGA northbridge
 
-config MIPS_ATLAS
-	bool "MIPS Atlas board"
-	select BOOT_ELF32
-	select BOOT_RAW
-	select CEVT_R4K
-	select CSRC_R4K
-	select DMA_NONCOHERENT
-	select SYS_HAS_EARLY_PRINTK
-	select IRQ_CPU
-	select HW_HAS_PCI
-	select MIPS_BOARDS_GEN
-	select MIPS_BONITO64
-	select PCI_GT64XXX_PCI0
-	select MIPS_MSC
-	select RM7000_CPU_SCACHE
-	select SWAP_IO_SPACE
-	select SYS_HAS_CPU_MIPS32_R1
-	select SYS_HAS_CPU_MIPS32_R2
-	select SYS_HAS_CPU_MIPS64_R1
-	select SYS_HAS_CPU_NEVADA
-	select SYS_HAS_CPU_RM7000
-	select SYS_SUPPORTS_32BIT_KERNEL
-	select SYS_SUPPORTS_64BIT_KERNEL
-	select SYS_SUPPORTS_BIG_ENDIAN
-	select SYS_SUPPORTS_LITTLE_ENDIAN
-	select SYS_SUPPORTS_MULTITHREADING if EXPERIMENTAL
-	select SYS_SUPPORTS_SMARTMIPS
-	select GENERIC_HARDIRQS_NO__DO_IRQ
-	help
-	  This enables support for the MIPS Technologies Atlas evaluation
-	  board.
-
 config MIPS_MALTA
 	bool "MIPS Malta board"
 	select ARCH_MAY_HAVE_PC_FDC
@@ -249,26 +217,6 @@ config MIPS_MALTA
 	  This enables support for the MIPS Technologies Malta evaluation
 	  board.
 
-config MIPS_SEAD
-	bool "MIPS SEAD board"
-	select CEVT_R4K
-	select CSRC_R4K
-	select IRQ_CPU
-	select DMA_NONCOHERENT
-	select SYS_HAS_EARLY_PRINTK
-	select MIPS_BOARDS_GEN
-	select SYS_HAS_CPU_MIPS32_R1
-	select SYS_HAS_CPU_MIPS32_R2
-	select SYS_HAS_CPU_MIPS64_R1
-	select SYS_SUPPORTS_32BIT_KERNEL
-	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
-	select SYS_SUPPORTS_BIG_ENDIAN
-	select SYS_SUPPORTS_LITTLE_ENDIAN
-	select SYS_SUPPORTS_SMARTMIPS
-	help
-	  This enables support for the MIPS Technologies SEAD evaluation
-	  board.
-
 config MIPS_SIM
 	bool 'MIPS simulator (MIPSsim)'
 	select CEVT_R4K
@@ -437,6 +385,8 @@ config SGI_IP28
 	select SGI_HAS_DS1286
 	select SGI_HAS_I8042
 	select SGI_HAS_INDYDOG
+	select SGI_HAS_HAL2
+	select SGI_HAS_HAL2
 	select SGI_HAS_SEEQ
 	select SGI_HAS_WD93
 	select SGI_HAS_ZILOG
@@ -602,65 +552,11 @@ config SNI_RM
 	  Technology and now in turn merged with Fujitsu.  Say Y here to
 	  support this machine type.
 
-config TOSHIBA_JMR3927
-	bool "Toshiba JMR-TX3927 board"
-	select CEVT_TXX9
-	select DMA_NONCOHERENT
-	select HW_HAS_PCI
-	select MIPS_TX3927
-	select IRQ_TXX9
-	select SWAP_IO_SPACE
-	select SYS_HAS_CPU_TX39XX
-	select SYS_SUPPORTS_32BIT_KERNEL
-	select SYS_SUPPORTS_LITTLE_ENDIAN
-	select SYS_SUPPORTS_BIG_ENDIAN
-	select GENERIC_HARDIRQS_NO__DO_IRQ
-	select GPIO_TXX9
+config MACH_TX39XX
+	bool "Toshiba TX39 series based machines"
 
-config TOSHIBA_RBTX4927
-	bool "Toshiba RBTX49[23]7 board"
-	select CEVT_R4K
-	select CSRC_R4K
-	select CEVT_TXX9
-	select DMA_NONCOHERENT
-	select HAS_TXX9_SERIAL
-	select HW_HAS_PCI
-	select IRQ_CPU
-	select IRQ_TXX9
-	select I8259 if TOSHIBA_FPCIB0
-	select SWAP_IO_SPACE
-	select SYS_HAS_CPU_TX49XX
-	select SYS_SUPPORTS_32BIT_KERNEL
-	select SYS_SUPPORTS_64BIT_KERNEL
-	select SYS_SUPPORTS_LITTLE_ENDIAN
-	select SYS_SUPPORTS_BIG_ENDIAN
-	select SYS_SUPPORTS_KGDB
-	select GENERIC_HARDIRQS_NO__DO_IRQ
-	help
-	  This Toshiba board is based on the TX4927 processor. Say Y here to
-	  support this machine type
-
-config TOSHIBA_RBTX4938
-	bool "Toshiba RBTX4938 board"
-	select CEVT_R4K
-	select CSRC_R4K
-	select CEVT_TXX9
-	select DMA_NONCOHERENT
-	select HAS_TXX9_SERIAL
-	select HW_HAS_PCI
-	select IRQ_CPU
-	select IRQ_TXX9
-	select SWAP_IO_SPACE
-	select SYS_HAS_CPU_TX49XX
-	select SYS_SUPPORTS_32BIT_KERNEL
-	select SYS_SUPPORTS_LITTLE_ENDIAN
-	select SYS_SUPPORTS_BIG_ENDIAN
-	select SYS_SUPPORTS_KGDB
-	select GENERIC_HARDIRQS_NO__DO_IRQ
-	select GPIO_TXX9
-	help
-	  This Toshiba board is based on the TX4938 processor. Say Y here to
-	  support this machine type
+config MACH_TX49XX
+	bool "Toshiba TX49 series based machines"
 
 config WR_PPMC
 	bool "Wind River PPMC board"
@@ -694,8 +590,7 @@ source "arch/mips/lasat/Kconfig"
 source "arch/mips/pmc-sierra/Kconfig"
 source "arch/mips/sgi-ip27/Kconfig"
 source "arch/mips/sibyte/Kconfig"
-source "arch/mips/tx4927/Kconfig"
-source "arch/mips/tx4938/Kconfig"
+source "arch/mips/txx9/Kconfig"
 source "arch/mips/vr41xx/Kconfig"
 
 endmenu
@@ -939,10 +834,6 @@ config PCI_GT64XXX_PCI0
 config NO_EXCEPT_FILL
 	bool
 
-config MIPS_TX3927
-	bool
-	select HAS_TXX9_SERIAL
-
 config MIPS_RM9122
 	bool
 	select SERIAL_RM9000
@@ -979,6 +870,9 @@ config SGI_HAS_DS1286
 config SGI_HAS_INDYDOG
 	bool
 
+config SGI_HAS_HAL2
+	bool
+
 config SGI_HAS_SEEQ
 	bool
 
@@ -2065,10 +1959,6 @@ source "fs/Kconfig.binfmt"
 config TRAD_SIGNALS
 	bool
 
-config BINFMT_IRIX
-	bool "Include IRIX binary compatibility"
-	depends on CPU_BIG_ENDIAN && 32BIT && BROKEN
-
 config MIPS32_COMPAT
 	bool "Kernel support for Linux/MIPS 32-bit binary compatibility"
 	depends on 64BIT

arch/mips/Makefile

View file

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index ad36c94..3564533 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -14,7 +14,7 @@
 
 KBUILD_DEFCONFIG := ip22_defconfig
 
-cflags-y :=
+cflags-y := -ffunction-sections
 
 #
 # Select the object file format to substitute into the linker script.
@@ -305,36 +305,14 @@ load-$(CONFIG_LEMOTE_FULONG) +=0xffffffff80100000
 cflags-$(CONFIG_LEMOTE_FULONG) += -Iinclude/asm-mips/mach-lemote
 
 #
-# For all MIPS, Inc. eval boards
-#
-core-$(CONFIG_MIPS_BOARDS_GEN)	+= arch/mips/mips-boards/generic/
-
-#
-# MIPS Atlas board
-#
-core-$(CONFIG_MIPS_ATLAS)	+= arch/mips/mips-boards/atlas/
-cflags-$(CONFIG_MIPS_ATLAS)	+= -Iinclude/asm-mips/mach-atlas
-cflags-$(CONFIG_MIPS_ATLAS)	+= -Iinclude/asm-mips/mach-mips
-load-$(CONFIG_MIPS_ATLAS)	+= 0xffffffff80100000
-all-$(CONFIG_MIPS_ATLAS)	:= vmlinux.bin
-
-#
 # MIPS Malta board
 #
-core-$(CONFIG_MIPS_MALTA)	+= arch/mips/mips-boards/malta/
-cflags-$(CONFIG_MIPS_MALTA)	+= -Iinclude/asm-mips/mach-mips
+core-$(CONFIG_MIPS_MALTA)	+= arch/mips/mti-malta/
+cflags-$(CONFIG_MIPS_MALTA)	+= -Iinclude/asm-mips/mach-malta
 load-$(CONFIG_MIPS_MALTA)	+= 0xffffffff80100000
 all-$(CONFIG_MIPS_MALTA)	:= vmlinux.bin
 
 #
-# MIPS SEAD board
-#
-core-$(CONFIG_MIPS_SEAD)	+= arch/mips/mips-boards/sead/
-cflags-$(CONFIG_MIPS_SEAD)	+= -Iinclude/asm-mips/mach-mips
-load-$(CONFIG_MIPS_SEAD)	+= 0xffffffff80100000
-all-$(CONFIG_MIPS_SEAD)		:= vmlinux.srec
-
-#
 # MIPS SIM
 #
 core-$(CONFIG_MIPS_SIM)		+= arch/mips/mipssim/
@@ -377,12 +355,6 @@ core-$(CONFIG_MACH_VR41XX)	+= arch/mips/vr41xx/common/
 cflags-$(CONFIG_MACH_VR41XX)	+= -Iinclude/asm-mips/mach-vr41xx
 
 #
-# NEC VR4133
-#
-core-$(CONFIG_NEC_CMBVR4133)	+= arch/mips/vr41xx/nec-cmbvr4133/
-load-$(CONFIG_NEC_CMBVR4133)	+= 0xffffffff80100000
-
-#
 # ZAO Networks Capcella (VR4131)
 #
 load-$(CONFIG_ZAO_CAPCELLA)	+= 0xffffffff80000000
@@ -573,29 +545,30 @@ endif
 all-$(CONFIG_SNI_RM)		:= vmlinux.ecoff
 
 #
+# Common TXx9
+#
+core-$(CONFIG_MACH_TX39XX)	+= arch/mips/txx9/generic/
+cflags-$(CONFIG_MACH_TX39XX) += -Iinclude/asm-mips/mach-tx39xx
+load-$(CONFIG_MACH_TX39XX)	+= 0xffffffff80050000
+core-$(CONFIG_MACH_TX49XX)	+= arch/mips/txx9/generic/
+cflags-$(CONFIG_MACH_TX49XX) += -Iinclude/asm-mips/mach-tx49xx
+load-$(CONFIG_MACH_TX49XX)	+= 0xffffffff80100000
+
+#
 # Toshiba JMR-TX3927 board
 #
-core-$(CONFIG_TOSHIBA_JMR3927)	+= arch/mips/jmr3927/rbhma3100/ \
-				   arch/mips/jmr3927/common/
-cflags-$(CONFIG_TOSHIBA_JMR3927) += -Iinclude/asm-mips/mach-jmr3927
-load-$(CONFIG_TOSHIBA_JMR3927)	+= 0xffffffff80050000
+core-$(CONFIG_TOSHIBA_JMR3927)	+= arch/mips/txx9/jmr3927/
 
 #
 # Toshiba RBTX4927 board or
 # Toshiba RBTX4937 board
 #
-core-$(CONFIG_TOSHIBA_RBTX4927)	+= arch/mips/tx4927/toshiba_rbtx4927/
-core-$(CONFIG_TOSHIBA_RBTX4927)	+= arch/mips/tx4927/common/
-cflags-$(CONFIG_TOSHIBA_RBTX4927) += -Iinclude/asm-mips/mach-tx49xx
-load-$(CONFIG_TOSHIBA_RBTX4927)	+= 0xffffffff80020000
+core-$(CONFIG_TOSHIBA_RBTX4927)	+= arch/mips/txx9/rbtx4927/
 
 #
 # Toshiba RBTX4938 board
 #
-core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/tx4938/toshiba_rbtx4938/
-core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/tx4938/common/
-cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx
-load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000
+core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/txx9/rbtx4938/
 
 cflags-y			+= -Iinclude/asm-mips/mach-generic
 drivers-$(CONFIG_PCI)		+= arch/mips/pci/

arch/mips/au1000/common/platform.c

View file

diff --git a/arch/mips/au1000/common/platform.c b/arch/mips/au1000/common/platform.c
index 74d6d4a..dc8a67e 100644
--- a/arch/mips/au1000/common/platform.c
+++ b/arch/mips/au1000/common/platform.c
@@ -11,6 +11,7 @@
  * warranty of any kind, whether express or implied.
  */
 
+#include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
 #include <linux/init.h>
@@ -77,14 +78,14 @@ static struct resource au1xxx_usb_ohci_resources[] = {
 };
 
 /* The dmamask must be set for OHCI to work */
-static u64 ohci_dmamask = ~(u32)0;
+static u64 ohci_dmamask = DMA_32BIT_MASK;
 
 static struct platform_device au1xxx_usb_ohci_device = {
 	.name		= "au1xxx-ohci",
 	.id		= 0,
 	.dev = {
 		.dma_mask		= &ohci_dmamask,
-		.coherent_dma_mask	= 0xffffffff,
+		.coherent_dma_mask	= DMA_32BIT_MASK,
 	},
 	.num_resources	= ARRAY_SIZE(au1xxx_usb_ohci_resources),
 	.resource	= au1xxx_usb_ohci_resources,
@@ -106,14 +107,14 @@ static struct resource au1100_lcd_resources[] = {
 	}
 };
 
-static u64 au1100_lcd_dmamask = ~(u32)0;
+static u64 au1100_lcd_dmamask = DMA_32BIT_MASK;
 
 static struct platform_device au1100_lcd_device = {
 	.name           = "au1100-lcd",
 	.id             = 0,
 	.dev = {
 		.dma_mask               = &au1100_lcd_dmamask,
-		.coherent_dma_mask      = 0xffffffff,
+		.coherent_dma_mask      = DMA_32BIT_MASK,
 	},
 	.num_resources  = ARRAY_SIZE(au1100_lcd_resources),
 	.resource       = au1100_lcd_resources,
@@ -135,14 +136,14 @@ static struct resource au1xxx_usb_ehci_resources[] = {
 	},
 };
 
-static u64 ehci_dmamask = ~(u32)0;
+static u64 ehci_dmamask = DMA_32BIT_MASK;
 
 static struct platform_device au1xxx_usb_ehci_device = {
 	.name		= "au1xxx-ehci",
 	.id		= 0,
 	.dev = {
 		.dma_mask		= &ehci_dmamask,
-		.coherent_dma_mask	= 0xffffffff,
+		.coherent_dma_mask	= DMA_32BIT_MASK,
 	},
 	.num_resources	= ARRAY_SIZE(au1xxx_usb_ehci_resources),
 	.resource	= au1xxx_usb_ehci_resources,
@@ -180,14 +181,14 @@ static struct resource au1xxx_mmc_resources[] = {
 	}
 };
 
-static u64 udc_dmamask = ~(u32)0;
+static u64 udc_dmamask = DMA_32BIT_MASK;
 
 static struct platform_device au1xxx_usb_gdt_device = {
 	.name		= "au1xxx-udc",
 	.id		= 0,
 	.dev = {
 		.dma_mask		= &udc_dmamask,
-		.coherent_dma_mask	= 0xffffffff,
+		.coherent_dma_mask	= DMA_32BIT_MASK,
 	},
 	.num_resources	= ARRAY_SIZE(au1xxx_usb_gdt_resources),
 	.resource	= au1xxx_usb_gdt_resources,
@@ -207,14 +208,14 @@ static struct resource au1xxx_usb_otg_resources[] = {
 	},
 };
 
-static u64 uoc_dmamask = ~(u32)0;
+static u64 uoc_dmamask = DMA_32BIT_MASK;
 
 static struct platform_device au1xxx_usb_otg_device = {
 	.name		= "au1xxx-uoc",
 	.id		= 0,
 	.dev = {
 		.dma_mask		= &uoc_dmamask,
-		.coherent_dma_mask	= 0xffffffff,
+		.coherent_dma_mask	= DMA_32BIT_MASK,
 	},
 	.num_resources	= ARRAY_SIZE(au1xxx_usb_otg_resources),
 	.resource	= au1xxx_usb_otg_resources,
@@ -233,27 +234,27 @@ static struct resource au1200_lcd_resources[] = {
 	}
 };
 
-static u64 au1200_lcd_dmamask = ~(u32)0;
+static u64 au1200_lcd_dmamask = DMA_32BIT_MASK;
 
 static struct platform_device au1200_lcd_device = {
 	.name           = "au1200-lcd",
 	.id             = 0,
 	.dev = {
 		.dma_mask               = &au1200_lcd_dmamask,
-		.coherent_dma_mask      = 0xffffffff,
+		.coherent_dma_mask      = DMA_32BIT_MASK,
 	},
 	.num_resources  = ARRAY_SIZE(au1200_lcd_resources),
 	.resource       = au1200_lcd_resources,
 };
 
-static u64 au1xxx_mmc_dmamask =  ~(u32)0;
+static u64 au1xxx_mmc_dmamask =  DMA_32BIT_MASK;
 
 static struct platform_device au1xxx_mmc_device = {
 	.name = "au1xxx-mmc",
 	.id = 0,
 	.dev = {
 		.dma_mask               = &au1xxx_mmc_dmamask,
-		.coherent_dma_mask      = 0xffffffff,
+		.coherent_dma_mask      = DMA_32BIT_MASK,
 	},
 	.num_resources  = ARRAY_SIZE(au1xxx_mmc_resources),
 	.resource       = au1xxx_mmc_resources,

arch/mips/au1000/mtx-1/platform.c

View file

diff --git a/arch/mips/au1000/mtx-1/platform.c b/arch/mips/au1000/mtx-1/platform.c
index 9807be3..8b5914d 100644
--- a/arch/mips/au1000/mtx-1/platform.c
+++ b/arch/mips/au1000/mtx-1/platform.c
@@ -24,6 +24,9 @@
 #include <linux/gpio.h>
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
+#include <mtd/mtd-abi.h>
 
 static struct gpio_keys_button mtx1_gpio_button[] = {
 	{
@@ -85,10 +88,56 @@ static struct platform_device mtx1_gpio_leds = {
 	}
 };
 
+static struct mtd_partition mtx1_mtd_partitions[] = {
+	{
+		.name	= "filesystem",
+		.size	= 0x01C00000,
+		.offset	= 0,
+	},
+	{
+		.name	= "yamon",
+		.size	= 0x00100000,
+		.offset	= MTDPART_OFS_APPEND,
+		.mask_flags = MTD_WRITEABLE,
+	},
+	{
+		.name	= "kernel",
+		.size	= 0x002c0000,
+		.offset	= MTDPART_OFS_APPEND,
+	},
+	{
+		.name	= "yamon env",
+		.size	= 0x00040000,
+		.offset	= MTDPART_OFS_APPEND,
+	},
+};
+
+static struct physmap_flash_data mtx1_flash_data = {
+	.width		= 4,
+	.nr_parts	= 4,
+	.parts		= mtx1_mtd_partitions,
+};
+
+static struct resource mtx1_mtd_resource = {
+	.start	= 0x1e000000,
+	.end	= 0x1fffffff,
+	.flags	= IORESOURCE_MEM,
+};
+
+static struct platform_device mtx1_mtd = {
+	.name		= "physmap-flash",
+	.dev		= {
+		.platform_data	= &mtx1_flash_data,
+	},
+	.num_resources	= 1,
+	.resource	= &mtx1_mtd_resource,
+};
+
 static struct __initdata platform_device * mtx1_devs[] = {
 	&mtx1_gpio_leds,
 	&mtx1_wdt,
-	&mtx1_button
+	&mtx1_button,
+	&mtx1_mtd,
 };
 
 static int __init mtx1_register_devices(void)

arch/mips/au1000/pb1200/platform.c

View file

diff --git a/arch/mips/au1000/pb1200/platform.c b/arch/mips/au1000/pb1200/platform.c
index 5930110..f8fb0ae 100644
--- a/arch/mips/au1000/pb1200/platform.c
+++ b/arch/mips/au1000/pb1200/platform.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <linux/dma-mapping.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
 
@@ -36,14 +37,14 @@ static struct resource ide_resources[] = {
 	}
 };
 
-static u64 ide_dmamask = ~(u32)0;
+static u64 ide_dmamask = DMA_32BIT_MASK;
 
 static struct platform_device ide_device = {
 	.name		= "au1200-ide",
 	.id		= 0,
 	.dev = {
 		.dma_mask 		= &ide_dmamask,
-		.coherent_dma_mask	= 0xffffffff,
+		.coherent_dma_mask	= DMA_32BIT_MASK,
 	},
 	.num_resources	= ARRAY_SIZE(ide_resources),
 	.resource	= ide_resources

arch/mips/cobalt/Makefile

View file

diff --git a/arch/mips/cobalt/Makefile b/arch/mips/cobalt/Makefile
index d73833b..2379262 100644
--- a/arch/mips/cobalt/Makefile
+++ b/arch/mips/cobalt/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the Cobalt micro systems family specific parts of the kernel
 #
 
-obj-y := buttons.o irq.o led.o reset.o rtc.o serial.o setup.o time.o
+obj-y := buttons.o irq.o lcd.o led.o reset.o rtc.o serial.o setup.o time.o
 
 obj-$(CONFIG_PCI)		+= pci.o
 obj-$(CONFIG_EARLY_PRINTK)	+= console.o

arch/mips/cobalt/lcd.c

View file

diff --git a/arch/mips/cobalt/lcd.c b/arch/mips/cobalt/lcd.c
new file mode 100644
index 0000000..0720e4f
--- /dev/null
+++ b/arch/mips/cobalt/lcd.c
@@ -0,0 +1,55 @@
+/*
+ *  Registration of Cobalt LCD platform device.
+ *
+ *  Copyright (C) 2008  Yoichi Yuasa <[email protected]>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/platform_device.h>
+
+static struct resource cobalt_lcd_resource __initdata = {
+	.start	= 0x1f000000,
+	.end	= 0x1f00001f,
+	.flags	= IORESOURCE_MEM,
+};
+
+static __init int cobalt_lcd_add(void)
+{
+	struct platform_device *pdev;
+	int retval;
+
+	pdev = platform_device_alloc("cobalt-lcd", -1);
+	if (!pdev)
+		return -ENOMEM;
+
+	retval = platform_device_add_resources(pdev, &cobalt_lcd_resource, 1);
+	if (retval)
+		goto err_free_device;
+
+	retval = platform_device_add(pdev);
+	if (retval)
+		goto err_free_device;
+
+	return 0;
+
+err_free_device:
+	platform_device_put(pdev);
+