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

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (37 commits)
  MIPS: O32: Provide definition of registers ta0 .. ta3.
  MIPS: perf: Add Octeon support for hardware perf.
  MIPS: perf: Add support for 64-bit perf counters.
  MIPS: perf: Reorganize contents of perf support files.
  MIPS: perf: Cleanup formatting in arch/mips/kernel/perf_event.c
  MIPS: Add accessor macros for 64-bit performance counter registers.
  MIPS: Add probes for more Octeon II CPUs.
  MIPS: Add more CPU identifiers for Octeon II CPUs.
  MIPS: XLR, XLS: Add comment for smp setup
  MIPS: JZ4740: GPIO: Check correct IRQ in demux handler
  MIPS: JZ4740: GPIO: Simplify IRQ demuxer
  MIPS: JZ4740: Use generic irq chip
  MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines
  MIPS: Alchemy: kill au1xxx.h header
  MIPS: Alchemy: clean DMA code of CONFIG_SOC_AU1??? defines
  MIPS, IDE: Alchem, au1xxx-ide: Remove pb1200/db1200 header dep
  MIPS: Alchemy: Redo PCI as platform driver
  MIPS: Alchemy: more base address cleanup
  MIPS: Alchemy: rewrite USB platform setup.
  MIPS: Alchemy: abstract USB block control register access
  ...

Fix up trivial conflicts in:
	arch/mips/alchemy/devboards/db1x00/platform.c
	drivers/ide/Kconfig
	drivers/mmc/host/au1xmmc.c
	drivers/video/Kconfig
	sound/mips/Kconfig

1 files changed, 15 insertions, 35 deletions

diff --git a/arch/mips/alchemy/Kconfig b/arch/mips/alchemy/Kconfig
index 2ccfd4a135b..2a68be6a1b9 100644
--- a/arch/mips/alchemy/Kconfig
+++ b/arch/mips/alchemy/Kconfig
@@ -18,20 +18,20 @@ config MIPS_MTX1
         bool "4G Systems MTX-1 board"
         select DMA_NONCOHERENT
         select HW_HAS_PCI
-        select SOC_AU1500
+        select ALCHEMY_GPIOINT_AU1000
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_HAS_EARLY_PRINTK
 
 config MIPS_BOSPORUS
         bool "Alchemy Bosporus board"
-        select SOC_AU1500
+        select ALCHEMY_GPIOINT_AU1000
         select DMA_NONCOHERENT
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_HAS_EARLY_PRINTK
 
 config MIPS_DB1000
         bool "Alchemy DB1000 board"
-        select SOC_AU1000
+        select ALCHEMY_GPIOINT_AU1000
         select DMA_NONCOHERENT
         select HW_HAS_PCI
         select SYS_SUPPORTS_LITTLE_ENDIAN
@@ -39,14 +39,14 @@ config MIPS_DB1000
 
 config MIPS_DB1100
         bool "Alchemy DB1100 board"
-        select SOC_AU1100
+        select ALCHEMY_GPIOINT_AU1000
         select DMA_NONCOHERENT
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_HAS_EARLY_PRINTK
 
 config MIPS_DB1200
         bool "Alchemy DB1200 board"
-        select SOC_AU1200
+        select ALCHEMY_GPIOINT_AU1000
         select DMA_COHERENT
         select MIPS_DISABLE_OBSOLETE_IDE
         select SYS_SUPPORTS_LITTLE_ENDIAN
@@ -54,7 +54,7 @@ config MIPS_DB1200
 
 config MIPS_DB1500
         bool "Alchemy DB1500 board"
-        select SOC_AU1500
+        select ALCHEMY_GPIOINT_AU1000
         select DMA_NONCOHERENT
         select HW_HAS_PCI
         select MIPS_DISABLE_OBSOLETE_IDE
@@ -64,7 +64,7 @@ config MIPS_DB1500
 
 config MIPS_DB1550
         bool "Alchemy DB1550 board"
-        select SOC_AU1550
+        select ALCHEMY_GPIOINT_AU1000
         select HW_HAS_PCI
         select DMA_NONCOHERENT
         select MIPS_DISABLE_OBSOLETE_IDE
@@ -74,13 +74,13 @@ config MIPS_DB1550
 config MIPS_MIRAGE
         bool "Alchemy Mirage board"
         select DMA_NONCOHERENT
-        select SOC_AU1500
+        select ALCHEMY_GPIOINT_AU1000
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_HAS_EARLY_PRINTK
 
 config MIPS_PB1000
         bool "Alchemy PB1000 board"
-        select SOC_AU1000
+        select ALCHEMY_GPIOINT_AU1000
         select DMA_NONCOHERENT
         select HW_HAS_PCI
         select SWAP_IO_SPACE
@@ -89,7 +89,7 @@ config MIPS_PB1000
 
 config MIPS_PB1100
         bool "Alchemy PB1100 board"
-        select SOC_AU1100
+        select ALCHEMY_GPIOINT_AU1000
         select DMA_NONCOHERENT
         select HW_HAS_PCI
         select SWAP_IO_SPACE
@@ -98,7 +98,7 @@ config MIPS_PB1100
 
 config MIPS_PB1200
         bool "Alchemy PB1200 board"
-        select SOC_AU1200
+        select ALCHEMY_GPIOINT_AU1000
         select DMA_NONCOHERENT
         select MIPS_DISABLE_OBSOLETE_IDE
         select SYS_SUPPORTS_LITTLE_ENDIAN
@@ -106,7 +106,7 @@ config MIPS_PB1200
 
 config MIPS_PB1500
         bool "Alchemy PB1500 board"
-        select SOC_AU1500
+        select ALCHEMY_GPIOINT_AU1000
         select DMA_NONCOHERENT
         select HW_HAS_PCI
         select SYS_SUPPORTS_LITTLE_ENDIAN
@@ -114,7 +114,7 @@ config MIPS_PB1500
 
 config MIPS_PB1550
         bool "Alchemy PB1550 board"
-        select SOC_AU1550
+        select ALCHEMY_GPIOINT_AU1000
         select DMA_NONCOHERENT
         select HW_HAS_PCI
         select MIPS_DISABLE_OBSOLETE_IDE
@@ -124,13 +124,13 @@ config MIPS_PB1550
 config MIPS_XXS1500
         bool "MyCable XXS1500 board"
         select DMA_NONCOHERENT
-        select SOC_AU1500
+        select ALCHEMY_GPIOINT_AU1000
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_HAS_EARLY_PRINTK
 
 config MIPS_GPR
         bool "Trapeze ITS GPR board"
-        select SOC_AU1550
+        select ALCHEMY_GPIOINT_AU1000
         select HW_HAS_PCI
         select DMA_NONCOHERENT
         select MIPS_DISABLE_OBSOLETE_IDE
@@ -138,23 +138,3 @@ config MIPS_GPR
         select SYS_HAS_EARLY_PRINTK
 
 endchoice
-
-config SOC_AU1000
-        bool
-        select ALCHEMY_GPIOINT_AU1000
-
-config SOC_AU1100
-        bool
-        select ALCHEMY_GPIOINT_AU1000
-
-config SOC_AU1500
-        bool
-        select ALCHEMY_GPIOINT_AU1000
-
-config SOC_AU1550
-        bool
-        select ALCHEMY_GPIOINT_AU1000
-
-config SOC_AU1200
-        bool
-        select ALCHEMY_GPIOINT_AU1000