Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / arch / arm / mach-pxa / Kconfig

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 656d496..914bb33 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -20,8 +20,13 @@ endmenu
 
 endif
 
-choice
-       prompt "Select target board"
+menu "Select target boards"
+
+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 ARCH_LUBBOCK
        bool "Intel DBPXA250 Development Platform"
@@ -31,10 +36,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"
@@ -51,6 +58,50 @@ config PXA_SHARPSL
          SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa)
          handheld computer.
 
+config ARCH_PXA_ESERIES
+       bool "PXA based Toshiba e-series PDAs"
+       select PXA25x
+
+config MACH_E330
+       bool "Toshiba e330"
+       default y
+       depends on ARCH_PXA_ESERIES
+       help
+         Say Y here if you intend to run this kernel on a Toshiba
+         e330 family PDA.
+
+config MACH_E740
+       bool "Toshiba e740"
+       default y
+       depends on ARCH_PXA_ESERIES
+       help
+         Say Y here if you intend to run this kernel on a Toshiba
+         e740 family PDA.
+
+config MACH_E750
+       bool "Toshiba e750"
+       default y
+       depends on ARCH_PXA_ESERIES
+       help
+         Say Y here if you intend to run this kernel on a Toshiba
+         e750 family PDA.
+
+config MACH_E400
+       bool "Toshiba e400"
+       default y
+       depends on ARCH_PXA_ESERIES
+       help
+         Say Y here if you intend to run this kernel on a Toshiba
+         e400 family PDA.
+
+config MACH_E800
+       bool "Toshiba e800"
+       default y
+       depends on ARCH_PXA_ESERIES
+       help
+         Say Y here if you intend to run this kernel on a Toshiba
+         e800 family PDA.
+
 config MACH_TRIZEPS4
        bool "Keith und Koep Trizeps4 DIMM-Module"
        select PXA27x
@@ -59,34 +110,77 @@ config MACH_EM_X270
        bool "CompuLab EM-x270 platform"
        select PXA27x
 
+config MACH_COLIBRI
+       bool "Toradex Colibri PX27x"
+       select PXA27x
+
 config MACH_ZYLONITE
        bool "PXA3xx Development Platform"
        select PXA3xx
+       select HAVE_PWM
+
+config MACH_LITTLETON
+       bool "PXA3xx Form Factor Platform (aka Littleton)"
+       select PXA3xx
+       select PXA_SSP
 
 config MACH_ARMCORE
        bool "CompuLab CM-X270 modules"
        select PXA27x
        select IWMMXT
 
+config MACH_MAGICIAN
+       bool "Enable HTC Magician Support"
+       depends on ARCH_PXA
+       select PXA27x
+       select IWMMXT
+
+config MACH_PCM027
+       bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"
+       select PXA27x
+       select IWMMXT
+
+endmenu
+
+choice
+       prompt "Used baseboard"
+       depends on MACH_PCM027
+
+config MACH_PCM990_BASEBOARD
+       bool "PHYTEC PCM-990 development board"
+       select HAVE_PWM
+
 endchoice
 
-if PXA_SHARPSL
+choice
+       prompt "display on pcm990"
+       depends on MACH_PCM990_BASEBOARD
+
+config PCM990_DISPLAY_SHARP
+       bool "sharp lq084v1dg21 stn display"
+
+config PCM990_DISPLAY_NEC
+       bool "nec nl6448bc20_18d tft display"
+
+config PCM990_DISPLAY_NONE
+       bool "no display"
+
+endchoice
+
+if ARCH_GUMSTIX
 
 choice
-       prompt "Select target Sharp Zaurus device range"
+       prompt "Select target Gumstix board"
 
-config PXA_SHARPSL_25x
-       bool "Sharp PXA25x models (SL-5600, SL-C7xx and SL-C6000x)"
+config MACH_GUMSTIX_F
+       bool "Basix, Connex, ws-200ax, ws-400ax systems"
        select PXA25x
 
-config PXA_SHARPSL_27x
-       bool "Sharp PXA270 models (SL-Cxx00)"
-       select PXA27x
-
 endchoice
 
 endif
 
+
 if MACH_TRIZEPS4
 
 choice
@@ -106,28 +200,33 @@ endmenu
 
 config MACH_POODLE
        bool "Enable Sharp SL-5600 (Poodle) Support"
-       depends on PXA_SHARPSL_25x
+       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_25x
+       depends on PXA_SHARPSL
+       select PXA25x
        select PXA_SHARP_C7xx
 
 config MACH_SHEPHERD
        bool "Enable Sharp SL-C750 (Shepherd) Support"
-       depends on PXA_SHARPSL_25x
+       depends on PXA_SHARPSL
+       select PXA25x
        select PXA_SHARP_C7xx
 
 config MACH_HUSKY
        bool "Enable Sharp SL-C760 (Husky) Support"
-       depends on PXA_SHARPSL_25x
+       depends on PXA_SHARPSL
+       select PXA25x
        select PXA_SHARP_C7xx
 
 config MACH_AKITA
        bool "Enable Sharp SL-1000 (Akita) Support"
-       depends on PXA_SHARPSL_27x
+       depends on PXA_SHARPSL
+       select PXA27x
        select PXA_SHARP_Cxx00
        select MACH_SPITZ
        select I2C
@@ -135,17 +234,20 @@ config MACH_AKITA
 
 config MACH_SPITZ
        bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"
-       depends on PXA_SHARPSL_27x
+       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_27x
+       depends on PXA_SHARPSL
+       select PXA27x
        select PXA_SHARP_Cxx00
 
 config MACH_TOSA
        bool "Enable Sharp SL-6000x (Tosa) Support"
-       depends on PXA_SHARPSL_25x
+       depends on PXA_SHARPSL
+       select PXA25x
 
 config PXA25x
        bool
@@ -180,4 +282,10 @@ 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
 endif