Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit bbdc818b270ab47658019fb1d67a0f14e9b17985

Authored by Haojian Zhuang
Committed by Haojian Zhuang
1 parent 192cfd5877
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

ARM: pxa: add dummy clock for pxa25x and pxa27x 

gpio-pxa driver is shared among arch-pxa and arch-mmp. Clock is the
essential component on pxa3xx/pxa95x and arch-mmp. So we need to
define dummy clock in pxa25x/pxa27x instead.

This regression was introduced by the commit "ARM: pxa: add dummy
clock for sa1100-rtc", id a55b5adaf403c4d032e0871ad4ee3367782f4db6.

Reported-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Paul Parsons <lost.distance@yahoo.com>
Tested-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>

Showing 2 changed files with 2 additions and 0 deletions Side-by-side Diff

arch/arm/mach-pxa/pxa25x.c
Diff comments   View file @ bbdc818
... ... @@ -208,6 +208,7 @@
208 208 INIT_CLKREG(&clk_pxa25x_gpio11, NULL, "GPIO11_CLK"),
209 209 INIT_CLKREG(&clk_pxa25x_gpio12, NULL, "GPIO12_CLK"),
210 210 INIT_CLKREG(&clk_pxa25x_mem, "pxa2xx-pcmcia", NULL),
  211 + INIT_CLKREG(&clk_dummy, "pxa-gpio", NULL),
211 212 };
212 213  
213 214 static struct clk_lookup pxa25x_hwuart_clkreg =
arch/arm/mach-pxa/pxa27x.c
Diff comments   View file @ bbdc818
... ... @@ -229,6 +229,7 @@
229 229 INIT_CLKREG(&clk_pxa27x_im, NULL, "IMCLK"),
230 230 INIT_CLKREG(&clk_pxa27x_memc, NULL, "MEMCLK"),
231 231 INIT_CLKREG(&clk_pxa27x_mem, "pxa2xx-pcmcia", NULL),
  232 + INIT_CLKREG(&clk_dummy, "pxa-gpio", NULL),
232 233 };
233 234  
234 235 #ifdef CONFIG_PM