diff options
| -rw-r--r-- | arch/arm/mach-pxa/Kconfig | 11 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/pxa-dt.c | 15 |
3 files changed, 27 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index e6690a44917d..83efe914bf7d 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig | |||
| @@ -4,6 +4,17 @@ menu "Intel PXA2xx/PXA3xx Implementations" | |||
| 4 | 4 | ||
| 5 | comment "Intel/Marvell Dev Platforms (sorted by hardware release time)" | 5 | comment "Intel/Marvell Dev Platforms (sorted by hardware release time)" |
| 6 | 6 | ||
| 7 | config MACH_PXA27X_DT | ||
| 8 | bool "Support PXA27x platforms from device tree" | ||
| 9 | select CPU_PXA27x | ||
| 10 | select POWER_SUPPLY | ||
| 11 | select PXA27x | ||
| 12 | select USE_OF | ||
| 13 | help | ||
| 14 | Include support for Marvell PXA27x based platforms using | ||
| 15 | the device tree. Needn't select any other machine while | ||
| 16 | MACH_PXA27X_DT is enabled. | ||
| 17 | |||
| 7 | config MACH_PXA3XX_DT | 18 | config MACH_PXA3XX_DT |
| 8 | bool "Support PXA3xx platforms from device tree" | 19 | bool "Support PXA3xx platforms from device tree" |
| 9 | select CPU_PXA300 | 20 | select CPU_PXA300 |
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile index 2fe1824c6dcb..eb0bf7678a99 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile | |||
| @@ -21,6 +21,7 @@ obj-$(CONFIG_CPU_PXA930) += pxa930.o | |||
| 21 | 21 | ||
| 22 | # Device Tree support | 22 | # Device Tree support |
| 23 | obj-$(CONFIG_MACH_PXA3XX_DT) += pxa-dt.o | 23 | obj-$(CONFIG_MACH_PXA3XX_DT) += pxa-dt.o |
| 24 | obj-$(CONFIG_MACH_PXA27X_DT) += pxa-dt.o | ||
| 24 | 25 | ||
| 25 | # Intel/Marvell Dev Platforms | 26 | # Intel/Marvell Dev Platforms |
| 26 | obj-$(CONFIG_ARCH_LUBBOCK) += lubbock.o | 27 | obj-$(CONFIG_ARCH_LUBBOCK) += lubbock.o |
diff --git a/arch/arm/mach-pxa/pxa-dt.c b/arch/arm/mach-pxa/pxa-dt.c index b070196f5a43..7e0e5bd0c9de 100644 --- a/arch/arm/mach-pxa/pxa-dt.c +++ b/arch/arm/mach-pxa/pxa-dt.c | |||
| @@ -58,3 +58,18 @@ DT_MACHINE_START(PXA_DT, "Marvell PXA3xx (Device Tree Support)") | |||
| 58 | .dt_compat = pxa3xx_dt_board_compat, | 58 | .dt_compat = pxa3xx_dt_board_compat, |
| 59 | MACHINE_END | 59 | MACHINE_END |
| 60 | #endif | 60 | #endif |
| 61 | |||
| 62 | #ifdef CONFIG_PXA27x | ||
| 63 | static const char * const pxa27x_dt_board_compat[] __initconst = { | ||
| 64 | "marvell,pxa270", | ||
| 65 | NULL, | ||
| 66 | }; | ||
| 67 | |||
| 68 | DT_MACHINE_START(PXA27X_DT, "Marvell PXA2xx (Device Tree Support)") | ||
| 69 | .map_io = pxa27x_map_io, | ||
| 70 | .init_irq = pxa27x_dt_init_irq, | ||
| 71 | .handle_irq = pxa27x_handle_irq, | ||
| 72 | .restart = pxa_restart, | ||
| 73 | .dt_compat = pxa27x_dt_board_compat, | ||
| 74 | MACHINE_END | ||
| 75 | #endif | ||
