Procházet zdrojové kódy

ARM: pxa: move gpio11 clock to board files

The pxa25x gpio11 clock output was previously selected on its pin by the
clock enabling, toggling the pin function.

As we transition to common clock framework, the pin function is moved to
board file for the 2 users, ie. lubbock and eseries.

Reviewed-by: Michael Turquette <mturquette@linaro.org>
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Robert Jarzmik před 10 roky
rodič
revize
70d64048c4
2 změnil soubory, kde provedl 7 přidání a 1 odebrání
  1. 4 1
      arch/arm/mach-pxa/eseries.c
  2. 3 0
      arch/arm/mach-pxa/lubbock.c

+ 4 - 1
arch/arm/mach-pxa/eseries.c

@@ -683,7 +683,7 @@ static unsigned long e750_pin_config[] __initdata = {
 	/* PC Card */
 	/* PC Card */
 	GPIO8_GPIO,   /* CD0 */
 	GPIO8_GPIO,   /* CD0 */
 	GPIO44_GPIO,  /* CD1 */
 	GPIO44_GPIO,  /* CD1 */
-	GPIO11_GPIO,  /* IRQ0 */
+	/* GPIO11_GPIO,  IRQ0 */
 	GPIO6_GPIO,   /* IRQ1 */
 	GPIO6_GPIO,   /* IRQ1 */
 	GPIO27_GPIO,  /* RST0 */
 	GPIO27_GPIO,  /* RST0 */
 	GPIO24_GPIO,  /* RST1 */
 	GPIO24_GPIO,  /* RST1 */
@@ -778,6 +778,9 @@ static unsigned long e800_pin_config[] __initdata = {
 	GPIO29_AC97_SDATA_IN_0,
 	GPIO29_AC97_SDATA_IN_0,
 	GPIO30_AC97_SDATA_OUT,
 	GPIO30_AC97_SDATA_OUT,
 	GPIO31_AC97_SYNC,
 	GPIO31_AC97_SYNC,
+
+	/* tc6393xb */
+	GPIO11_3_6MHz,
 };
 };
 
 
 static struct w100_gen_regs e800_lcd_regs = {
 static struct w100_gen_regs e800_lcd_regs = {

+ 3 - 0
arch/arm/mach-pxa/lubbock.c

@@ -101,6 +101,9 @@ static unsigned long lubbock_pin_config[] __initdata = {
 	GPIO6_MMC_CLK,
 	GPIO6_MMC_CLK,
 	GPIO8_MMC_CS0,
 	GPIO8_MMC_CS0,
 
 
+	/* SA1111 chip */
+	GPIO11_3_6MHz,
+
 	/* wakeup */
 	/* wakeup */
 	GPIO1_GPIO | WAKEUP_ON_EDGE_RISE,
 	GPIO1_GPIO | WAKEUP_ON_EDGE_RISE,
 };
 };