Merge branch 'pxa' into devel

Conflicts:

	arch/arm/configs/em_x270_defconfig
	arch/arm/configs/xm_x270_defconfig

1 files changed, 155 insertions, 85 deletions

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 5da7a6820492..e8ee7ec9ff6d 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -16,19 +16,24 @@ config CPU_PXA310
 config CPU_PXA320
         bool "PXA320 (codename Monahans-P)"
 
+config CPU_PXA930
+        bool "PXA930 (codename Tavor-P)"
+
 endmenu
 
 endif
 
-choice
-        prompt "Select target board"
-
 config ARCH_GUMSTIX
         bool "Gumstix XScale boards"
         help
           Say Y here if you intend to run this kernel on a
           Gumstix Full Function Minature Computer.
 
+config MACH_GUMSTIX_F
+        bool "Basix, Connex, ws-200ax, ws-400ax systems"
+        depends on ARCH_GUMSTIX
+        select PXA25x
+
 config ARCH_LUBBOCK
         bool "Intel DBPXA250 Development Platform"
         select PXA25x
@@ -37,10 +42,12 @@ config ARCH_LUBBOCK
 config MACH_LOGICPD_PXA270
         bool "LogicPD PXA270 Card Engine Development Platform"
         select PXA27x
+        select HAVE_PWM
 
 config MACH_MAINSTONE
         bool "Intel HCDDBBVA0 Development Platform"
         select PXA27x
+        select HAVE_PWM
 
 config ARCH_PXA_IDP
         bool "Accelent Xscale IDP"
@@ -57,6 +64,57 @@ config PXA_SHARPSL
           SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa)
           handheld computer.
 
+config MACH_POODLE
+        bool "Enable Sharp SL-5600 (Poodle) Support"
+        depends on PXA_SHARPSL
+        select PXA25x
+        select SHARP_LOCOMO
+        select PXA_SSP
+
+config MACH_CORGI
+        bool "Enable Sharp SL-C700 (Corgi) Support"
+        depends on PXA_SHARPSL
+        select PXA25x
+        select PXA_SHARP_C7xx
+
+config MACH_SHEPHERD
+        bool "Enable Sharp SL-C750 (Shepherd) Support"
+        depends on PXA_SHARPSL
+        select PXA25x
+        select PXA_SHARP_C7xx
+
+config MACH_HUSKY
+        bool "Enable Sharp SL-C760 (Husky) Support"
+        depends on PXA_SHARPSL
+        select PXA25x
+        select PXA_SHARP_C7xx
+
+config MACH_AKITA
+        bool "Enable Sharp SL-1000 (Akita) Support"
+        depends on PXA_SHARPSL
+        select PXA27x
+        select PXA_SHARP_Cxx00
+        select MACH_SPITZ
+        select I2C
+        select I2C_PXA
+
+config MACH_SPITZ
+        bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"
+        depends on PXA_SHARPSL
+        select PXA27x
+        select PXA_SHARP_Cxx00
+
+config MACH_BORZOI
+        bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support"
+        depends on PXA_SHARPSL
+        select PXA27x
+        select PXA_SHARP_Cxx00
+
+config MACH_TOSA
+        bool "Enable Sharp SL-6000x (Tosa) Support"
+        depends on PXA_SHARPSL
+        select PXA25x
+
 config ARCH_PXA_ESERIES
         bool "PXA based Toshiba e-series PDAs"
         select PXA25x
@@ -69,10 +127,19 @@ config MACH_E330
           Say Y here if you intend to run this kernel on a Toshiba
           e330 family PDA.
 
+config MACH_E350
+        bool "Toshiba e350"
+        default y
+        depends on ARCH_PXA_ESERIES
+        help
+          Say Y here if you intend to run this kernel on a Toshiba
+          e350 family PDA.
+
 config MACH_E740
         bool "Toshiba e740"
         default y
         depends on ARCH_PXA_ESERIES
+        select FB_W100
         help
           Say Y here if you intend to run this kernel on a Toshiba
           e740 family PDA.
@@ -81,6 +148,7 @@ config MACH_E750
         bool "Toshiba e750"
         default y
         depends on ARCH_PXA_ESERIES
+        select FB_W100
         help
           Say Y here if you intend to run this kernel on a Toshiba
           e750 family PDA.
@@ -97,6 +165,7 @@ config MACH_E800
         bool "Toshiba e800"
         default y
         depends on ARCH_PXA_ESERIES
+        select FB_W100
         help
           Say Y here if you intend to run this kernel on a Toshiba
           e800 family PDA.
@@ -105,6 +174,10 @@ config MACH_TRIZEPS4
         bool "Keith und Koep Trizeps4 DIMM-Module"
         select PXA27x
 
+config MACH_TRIZEPS4_CONXS
+        bool "ConXS Eval Board"
+        depends on MACH_TRIZEPS4
+
 config MACH_EM_X270
         bool "CompuLab EM-x270 platform"
         select PXA27x
@@ -114,14 +187,25 @@ config MACH_COLIBRI
         select PXA27x
 
 config MACH_ZYLONITE
-        bool "PXA3xx Development Platform"
+        bool "PXA3xx Development Platform (aka Zylonite)"
         select PXA3xx
+        select HAVE_PWM
 
 config MACH_LITTLETON
         bool "PXA3xx Form Factor Platform (aka Littleton)"
         select PXA3xx
         select PXA_SSP
 
+config MACH_TAVOREVB
+        bool "PXA930 Evaluation Board (aka TavorEVB)"
+        select PXA3xx
+        select PXA930
+
+config MACH_SAAR
+        bool "PXA930 Handheld Platform (aka SAAR)"
+        select PXA3xx
+        select PXA930
+
 config MACH_ARMCORE
         bool "CompuLab CM-X270 modules"
         select PXA27x
@@ -129,7 +213,6 @@ config MACH_ARMCORE
 
 config MACH_MAGICIAN
         bool "Enable HTC Magician Support"
-        depends on ARCH_PXA
         select PXA27x
         select IWMMXT
 
@@ -137,109 +220,81 @@ config MACH_PCM027
         bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"
         select PXA27x
         select IWMMXT
+        select PXA_SSP
 
-endchoice
+config ARCH_PXA_PALM
+        bool "PXA based Palm PDAs"
+        select HAVE_PWM
 
-choice
-        prompt "Used baseboard"
-        depends on MACH_PCM027
+config MACH_PALMTX
+        bool "Palm T|X"
+        default y
+        depends on ARCH_PXA_PALM
+        select PXA27x
+        select IWMMXT
+        help
+          Say Y here if you intend to run this kernel on a Palm T|X
+          handheld computer.
 
 config MACH_PCM990_BASEBOARD
         bool "PHYTEC PCM-990 development board"
-
-endchoice
-
-if PXA_SHARPSL
+        select HAVE_PWM
+        depends on MACH_PCM027
 
 choice
-        prompt "Select target Sharp Zaurus device range"
-
-config PXA_SHARPSL_25x
-        bool "Sharp PXA25x models (SL-5600, SL-C7xx and SL-C6000x)"
-        select PXA25x
-
-config PXA_SHARPSL_27x
-        bool "Sharp PXA270 models (SL-Cxx00)"
-        select PXA27x
-
-endchoice
+        prompt "display on pcm990"
+        depends on MACH_PCM990_BASEBOARD
 
-endif
+config PCM990_DISPLAY_SHARP
+        bool "sharp lq084v1dg21 stn display"
 
-if ARCH_GUMSTIX
+config PCM990_DISPLAY_NEC
+        bool "nec nl6448bc20_18d tft display"
 
-choice
-        prompt "Select target Gumstix board"
-
-config MACH_GUMSTIX_F
-        bool "Basix, Connex, ws-200ax, ws-400ax systems"
-        select PXA25x
+config PCM990_DISPLAY_NONE
+        bool "no display"
 
 endchoice
 
-endif
 
+config PXA_EZX
+        bool "Motorola EZX Platform"
+        select PXA27x
+        select IWMMXT
+        select HAVE_PWM
 
-if MACH_TRIZEPS4
+config MACH_EZX_A780
+        bool "Motorola EZX A780"
+        default y
+        depends on PXA_EZX
 
-choice
-        prompt "Select base board for Trizeps 4 module"
+config MACH_EZX_E680
+        bool "Motorola EZX E680"
+        default y
+        depends on PXA_EZX
 
-config MACH_TRIZEPS4_CONXS
-        bool "ConXS Eval Board"
+config MACH_EZX_A1200
+        bool "Motorola EZX A1200"
+        default y
+        depends on PXA_EZX
 
-config MACH_TRIZEPS4_ANY
-        bool "another Board"
+config MACH_EZX_A910
+        bool "Motorola EZX A910"
+        default y
+        depends on PXA_EZX
 
-endchoice
+config MACH_EZX_E6
+        bool "Motorola EZX E6"
+        default y
+        depends on PXA_EZX
 
-endif
+config MACH_EZX_E2
+        bool "Motorola EZX E2"
+        default y
+        depends on PXA_EZX
 
 endmenu
 
-config MACH_POODLE
-        bool "Enable Sharp SL-5600 (Poodle) Support"
-        depends on PXA_SHARPSL_25x
-        select SHARP_LOCOMO
-        select PXA_SSP
-
-config MACH_CORGI
-        bool "Enable Sharp SL-C700 (Corgi) Support"
-        depends on PXA_SHARPSL_25x
-        select PXA_SHARP_C7xx
-
-config MACH_SHEPHERD
-        bool "Enable Sharp SL-C750 (Shepherd) Support"
-        depends on PXA_SHARPSL_25x
-        select PXA_SHARP_C7xx
-
-config MACH_HUSKY
-        bool "Enable Sharp SL-C760 (Husky) Support"
-        depends on PXA_SHARPSL_25x
-        select PXA_SHARP_C7xx
-
-config MACH_AKITA
-        bool "Enable Sharp SL-1000 (Akita) Support"
-        depends on PXA_SHARPSL_27x
-        select PXA_SHARP_Cxx00
-        select MACH_SPITZ
-        select I2C
-        select I2C_PXA
-
-config MACH_SPITZ
-        bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"
-        depends on PXA_SHARPSL_27x
-        select PXA_SHARP_Cxx00
-
-config MACH_BORZOI
-        bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support"
-        depends on PXA_SHARPSL_27x
-        select PXA_SHARP_Cxx00
-
-config MACH_TOSA
-        bool "Enable Sharp SL-6000x (Tosa) Support"
-        depends on PXA_SHARPSL_25x
-
 config PXA25x
         bool
         help
@@ -273,4 +328,19 @@ config PXA_SSP
         tristate
         help
           Enable support for PXA2xx SSP ports
+
+config PXA_PWM
+        tristate
+        default BACKLIGHT_PWM
+        help
+          Enable support for PXA2xx/PXA3xx PWM controllers
+
+config TOSA_BT
+        tristate "Control the state of built-in bluetooth chip on Sharp SL-6000"
+        depends on MACH_TOSA
+        select RFKILL
+        help
+          This is a simple driver that is able to control
+          the state of built in bluetooth chip on tosa.
+
 endif