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
This commit is contained in:
@@ -57,7 +57,6 @@
|
||||
#include <mach/smemc.h>
|
||||
|
||||
#include "generic.h"
|
||||
#include "clock.h"
|
||||
#include "devices.h"
|
||||
|
||||
static unsigned long lubbock_pin_config[] __initdata = {
|
||||
@@ -102,6 +101,9 @@ static unsigned long lubbock_pin_config[] __initdata = {
|
||||
GPIO6_MMC_CLK,
|
||||
GPIO8_MMC_CS0,
|
||||
|
||||
/* SA1111 chip */
|
||||
GPIO11_3_6MHz,
|
||||
|
||||
/* wakeup */
|
||||
GPIO1_GPIO | WAKEUP_ON_EDGE_RISE,
|
||||
};
|
||||
|
Verwijs in nieuw issue
Block a user