Merge branch 'pxa-all' into devel

Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/corgi.c
	arch/arm/mach-pxa/include/mach/hardware.h
	arch/arm/mach-pxa/spitz.c

1 files changed, 90 insertions, 3 deletions

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index e484f609feda..f27f6b3d6e6f 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -38,16 +38,23 @@ config ARCH_LUBBOCK
         bool "Intel DBPXA250 Development Platform"
         select PXA25x
         select SA1111
+        select PXA_HAVE_BOARD_IRQS
 
 config MACH_LOGICPD_PXA270
         bool "LogicPD PXA270 Card Engine Development Platform"
         select PXA27x
         select HAVE_PWM
+        select PXA_HAVE_BOARD_IRQS
 
 config MACH_MAINSTONE
         bool "Intel HCDDBBVA0 Development Platform"
         select PXA27x
         select HAVE_PWM
+        select PXA_HAVE_BOARD_IRQS
+
+config MACH_MP900C
+        bool "Nec Mobilepro 900/c"
+        select PXA25x
 
 config ARCH_PXA_IDP
         bool "Accelent Xscale IDP"
@@ -114,10 +121,21 @@ config MACH_TOSA
         bool "Enable Sharp SL-6000x (Tosa) Support"
         depends on PXA_SHARPSL
         select PXA25x
+        select PXA_HAVE_BOARD_IRQS
+
+config ARCH_VIPER
+        bool "Arcom/Eurotech VIPER SBC"
+        select PXA25x
+        select ISA
+        select I2C_GPIO
+        select HAVE_PWM
+        select PXA_HAVE_BOARD_IRQS
+        select PXA_HAVE_ISA_IRQS
 
 config ARCH_PXA_ESERIES
         bool "PXA based Toshiba e-series PDAs"
         select PXA25x
+        select PXA_HAVE_BOARD_IRQS
 
 config MACH_E330
         bool "Toshiba e330"
@@ -170,13 +188,41 @@ config MACH_E800
           Say Y here if you intend to run this kernel on a Toshiba
           e800 family PDA.
 
+config TRIZEPS_PXA
+        bool "PXA based Keith und Koep Trizeps DIMM-Modules"
+
 config MACH_TRIZEPS4
         bool "Keith und Koep Trizeps4 DIMM-Module"
+        depends on TRIZEPS_PXA
+        select TRIZEPS_PCMCIA
         select PXA27x
 
-config MACH_TRIZEPS4_CONXS
+config MACH_TRIZEPS4WL
+        bool "Keith und Koep Trizeps4-WL DIMM-Module"
+        depends on TRIZEPS_PXA
+        select TRIZEPS_PCMCIA
+        select PXA27x
+        select PXA_SSP
+
+choice
+        prompt "Select base board for Trizeps module"
+        depends on TRIZEPS_PXA
+
+config MACH_TRIZEPS_CONXS
         bool "ConXS Eval Board"
-        depends on MACH_TRIZEPS4
+
+config MACH_TRIZEPS_UCONXS
+        bool "uConXS Eval Board"
+
+config MACH_TRIZEPS_ANY
+        bool "another Board"
+
+endchoice
+
+config TRIZEPS_PCMCIA
+        bool
+        help
+          Enable PCMCIA support for Trizeps modules
 
 config MACH_EM_X270
         bool "CompuLab EM-x270 platform"
@@ -189,6 +235,7 @@ config MACH_COLIBRI
 config MACH_ZYLONITE
         bool "PXA3xx Development Platform (aka Zylonite)"
         select PXA3xx
+        select PXA_SSP
         select HAVE_PWM
 
 config MACH_LITTLETON
@@ -207,21 +254,42 @@ config MACH_SAAR
         select PXA930
 
 config MACH_ARMCORE
-        bool "CompuLab CM-X270 modules"
+        bool "CompuLab CM-X255/CM-X270 modules"
         select PXA27x
         select IWMMXT
         select ZONE_DMA if PCI
+        select PXA25x
+        select PXA_SSP
+
+config MACH_CM_X300
+        bool "CompuLab CM-X300 modules"
+        select PXA3xx
+        select CPU_PXA300
 
 config MACH_MAGICIAN
         bool "Enable HTC Magician Support"
         select PXA27x
         select IWMMXT
+        select PXA_HAVE_BOARD_IRQS
+
+config MACH_MIOA701
+        bool "Mitac Mio A701 Support"
+        select PXA27x
+        select IWMMXT
+        select LEDS_GPIO
+        select HAVE_PWM
+        select GPIO_SYSFS
+        help
+          Say Y here if you intend to run this kernel on a
+          MIO A701. Currently there is only basic support
+          for this PDA.
 
 config MACH_PCM027
         bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"
         select PXA27x
         select IWMMXT
         select PXA_SSP
+        select PXA_HAVE_BOARD_IRQS
 
 config ARCH_PXA_PALM
         bool "PXA based Palm PDAs"
@@ -237,6 +305,16 @@ config MACH_PALMTX
           Say Y here if you intend to run this kernel on a Palm T|X
           handheld computer.
 
+config MACH_PALMZ72
+        bool "Palm Zire 72"
+        default y
+        depends on ARCH_PXA_PALM
+        select PXA27x
+        select IWMMXT
+        help
+          Say Y here if you intend to run this kernel on Palm Zire 72
+          handheld computer.
+
 config MACH_PCM990_BASEBOARD
         bool "PHYTEC PCM-990 development board"
         select HAVE_PWM
@@ -257,6 +335,9 @@ config PCM990_DISPLAY_NONE
 
 endchoice
 
+config MACH_AM200EPD
+        depends on MACH_GUMSTIX_F
+        bool "Enable AM200EPD board support"
 
 config PXA_EZX
         bool "Motorola EZX Platform"
@@ -344,4 +425,10 @@ config TOSA_BT
           This is a simple driver that is able to control
           the state of built in bluetooth chip on tosa.
 
+config PXA_HAVE_BOARD_IRQS
+        bool
+
+config PXA_HAVE_ISA_IRQS
+        bool
+
 endif