diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-05-15 18:40:15 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-15 18:40:15 +0300 |
commit | 7448adca9361b4ad97614a08c487e215f1990ad7 (patch) | |
tree | bdc898f66dd6416eabd2d30067481bb0de0413e2 /arch/arm/Kconfig | |
parent | e3abcb25d2aec8411ec1b197712b1085df5bfee3 (diff) | |
parent | 64227114c676d9b1fefa4d5070534f3d82d23711 (diff) | |
download | linux-7448adca9361b4ad97614a08c487e215f1990ad7.tar.xz |
Merge tag 'pxa-for-4.2' of https://github.com/rjarzmik/linux into next/soc
Merge "pxa changes for v4.2 cycle" from Robert Jarzmik:
The main and only feature is the conversion of all pxa variants to clock
framework. This encompasses pxa25x, pxa27x and pxa3xx, for all boards.
This should be a disruptive cycle in the normally quiet pxa history, as
the change can break any platform, and the test were performed on only 4
boards (lubbock, zylonite, mioa701, cm-x300).
* tag 'pxa-for-4.2' of https://github.com/rjarzmik/linux:
ARM: pxa: Constify irq_domain_ops
ARM: pxa: Transition pxa25x, pxa27x, pxa3xx to clk framework
ARM: pxa: convert eseries to clock framework
ARM: pxa: Transition pxa25x and pxa27x to clk framework
ARM: pxa: pxa27x skip default device initialization with DT
clk: pxa: add missing pxa27x clocks for Irda and sa1100-rtc
ARM: pxa: move gpio11 clock to board files
ARM: pxa: change clocks init sequence
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b2e0d98894d3..7cd23bb03244 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -606,6 +606,7 @@ config ARCH_PXA select ARCH_REQUIRE_GPIOLIB select ARM_CPU_SUSPEND if PM select AUTO_ZRELADDR + select COMMON_CLK select CLKDEV_LOOKUP select CLKSRC_MMIO select CLKSRC_OF |