diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-08-16 11:00:30 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-16 11:00:30 +0200 |
| commit | 71f8e5b260e17a428dd7513c7d1e01777b69139b (patch) | |
| tree | 4c90add345de8cadd83802b592a62a8d0aebc2d6 /arch/arm/mach-pxa/Kconfig | |
| parent | 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee (diff) | |
| parent | 51931b37fcb17a2f48f726fd21b88e3af770ddc2 (diff) | |
| download | talos-obmc-linux-71f8e5b260e17a428dd7513c7d1e01777b69139b.tar.gz talos-obmc-linux-71f8e5b260e17a428dd7513c7d1e01777b69139b.zip | |
Merge branch 'dt' of git://github.com/hzhuang1/linux into next/dt
From Haojian Zhuang <haojian.zhuang@gmail.com>:
Device Tree conversion patches for PXA and MMP, version 4
v4:
1. remove pinctrl patches for pxa.
v3:
1. Revert d03c1990c9681047bf94caa497c41172b3f28351 GPIO: gpio-pxa: fix
devicetree functions
since it's merged into Linus' gpio tree.
v2:
1. Add Linus's Ack in pinctrl driver.
2. Add chao's & haojian's patches for Tauros2 cache.
* 'dt' of git://github.com/hzhuang1/linux:
ARM: mmp: enable tauros2 cache in mmp2 dt
ARM: mmp: enable tauros2 cache in pxa910
ARM: cache: add dt support for tauros2 cache
ARM: mmp&dove: modify tauros2_init call
ARM: cache: add extra feature enable for tauros2
ARM: cache: add cputype.h for tauros2
ARM: cache: fix uninitialized ptr in tauros2_init
gpio: pxa: add chain_eneter and chain_exit for irq handler
ARM: pxa: support CKENC in clk_enable
ARM: pxa: add .dtsi files
ARM: pxa3xx: add generic DT machine code
ARM: pxa3xx: skip default device initialization when booting via DT
ARM: pxa: add devicetree code for irq handling
GPIO: gpio-pxa: simplify pxa_gpio_to_irq() and pxa_irq_to_chip()
MTD: pxa3xx-nand: add devicetree bindings
RTC: add DT bindings to pxa-rtc
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-pxa/Kconfig')
| -rw-r--r-- | arch/arm/mach-pxa/Kconfig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index fe2d1f80ef50..8e6288de69b9 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig @@ -25,6 +25,18 @@ config PXA_V7_MACH_AUTO if !ARCH_PXA_V7 comment "Intel/Marvell Dev Platforms (sorted by hardware release time)" +config MACH_PXA3XX_DT + bool "Support PXA3xx platforms from device tree" + select PXA3xx + select CPU_PXA300 + select POWER_SUPPLY + select HAVE_PWM + select USE_OF + help + Include support for Marvell PXA3xx based platforms using + the device tree. Needn't select any other machine while + MACH_PXA3XX_DT is enabled. + config ARCH_LUBBOCK bool "Intel DBPXA250 Development Platform (aka Lubbock)" select PXA25x |
