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

* '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
  ...

1 files changed, 10 insertions, 120 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index d2be3ffca280..d21df5f1b1f3 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