diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2012-11-26 05:18:53 -0500 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2012-11-26 05:18:53 -0500 |
| commit | 53d74fd79db19aae506de892273198b160c2ee95 (patch) | |
| tree | f6abab77c62d4931c09b8dffff2bc871d809a500 /arch/arm | |
| parent | 22595e28157e9a55f285a4971bd1d43b8457ffd5 (diff) | |
| parent | b53bc2819a71099ecfc3d61ba0796b3dcc6be321 (diff) | |
Merge commit 'gpio-lw/devel' into spear-for-3.8
This merges dependency branch gpio-lw/devel for SPEAr DT updates.
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/plat-spear/Kconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ade7e924bef..b673d65449f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -364,6 +364,7 @@ config ARCH_CNS3XXX | |||
| 364 | 364 | ||
| 365 | config ARCH_CLPS711X | 365 | config ARCH_CLPS711X |
| 366 | bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" | 366 | bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" |
| 367 | select ARCH_REQUIRE_GPIOLIB | ||
| 367 | select ARCH_USES_GETTIMEOFFSET | 368 | select ARCH_USES_GETTIMEOFFSET |
| 368 | select CLKDEV_LOOKUP | 369 | select CLKDEV_LOOKUP |
| 369 | select COMMON_CLK | 370 | select COMMON_CLK |
diff --git a/arch/arm/plat-spear/Kconfig b/arch/arm/plat-spear/Kconfig index f8db7b2deb3..87dbd81bdf5 100644 --- a/arch/arm/plat-spear/Kconfig +++ b/arch/arm/plat-spear/Kconfig | |||
| @@ -12,6 +12,7 @@ config ARCH_SPEAR13XX | |||
| 12 | bool "ST SPEAr13xx with Device Tree" | 12 | bool "ST SPEAr13xx with Device Tree" |
| 13 | select ARM_GIC | 13 | select ARM_GIC |
| 14 | select CPU_V7 | 14 | select CPU_V7 |
| 15 | select GPIO_SPEAR_SPICS | ||
| 15 | select HAVE_SMP | 16 | select HAVE_SMP |
| 16 | select MIGHT_HAVE_CACHE_L2X0 | 17 | select MIGHT_HAVE_CACHE_L2X0 |
| 17 | select PINCTRL | 18 | select PINCTRL |