diff options
Diffstat (limited to 'arch/arm/mach-pxa/pxa3xx.c')
-rw-r--r-- | arch/arm/mach-pxa/pxa3xx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index f107c71c7589..1570d457fea3 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c | |||
@@ -67,7 +67,6 @@ static struct clk_lookup pxa3xx_clkregs[] = { | |||
67 | INIT_CLKREG(&clk_pxa3xx_pout, NULL, "CLK_POUT"), | 67 | INIT_CLKREG(&clk_pxa3xx_pout, NULL, "CLK_POUT"), |
68 | /* Power I2C clock is always on */ | 68 | /* Power I2C clock is always on */ |
69 | INIT_CLKREG(&clk_dummy, "pxa3xx-pwri2c.1", NULL), | 69 | INIT_CLKREG(&clk_dummy, "pxa3xx-pwri2c.1", NULL), |
70 | INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL), | ||
71 | INIT_CLKREG(&clk_pxa3xx_lcd, "pxa2xx-fb", NULL), | 70 | INIT_CLKREG(&clk_pxa3xx_lcd, "pxa2xx-fb", NULL), |
72 | INIT_CLKREG(&clk_pxa3xx_camera, NULL, "CAMCLK"), | 71 | INIT_CLKREG(&clk_pxa3xx_camera, NULL, "CAMCLK"), |
73 | INIT_CLKREG(&clk_pxa3xx_ac97, NULL, "AC97CLK"), | 72 | INIT_CLKREG(&clk_pxa3xx_ac97, NULL, "AC97CLK"), |
@@ -90,6 +89,7 @@ static struct clk_lookup pxa3xx_clkregs[] = { | |||
90 | INIT_CLKREG(&clk_pxa3xx_mmc2, "pxa2xx-mci.1", NULL), | 89 | INIT_CLKREG(&clk_pxa3xx_mmc2, "pxa2xx-mci.1", NULL), |
91 | INIT_CLKREG(&clk_pxa3xx_smemc, "pxa2xx-pcmcia", NULL), | 90 | INIT_CLKREG(&clk_pxa3xx_smemc, "pxa2xx-pcmcia", NULL), |
92 | INIT_CLKREG(&clk_pxa3xx_gpio, "pxa-gpio", NULL), | 91 | INIT_CLKREG(&clk_pxa3xx_gpio, "pxa-gpio", NULL), |
92 | INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL), | ||
93 | }; | 93 | }; |
94 | 94 | ||
95 | #ifdef CONFIG_PM | 95 | #ifdef CONFIG_PM |
@@ -463,7 +463,6 @@ static int __init pxa3xx_init(void) | |||
463 | 463 | ||
464 | register_syscore_ops(&pxa_irq_syscore_ops); | 464 | register_syscore_ops(&pxa_irq_syscore_ops); |
465 | register_syscore_ops(&pxa3xx_mfp_syscore_ops); | 465 | register_syscore_ops(&pxa3xx_mfp_syscore_ops); |
466 | register_syscore_ops(&pxa_gpio_syscore_ops); | ||
467 | register_syscore_ops(&pxa3xx_clock_syscore_ops); | 466 | register_syscore_ops(&pxa3xx_clock_syscore_ops); |
468 | 467 | ||
469 | ret = platform_add_devices(devices, ARRAY_SIZE(devices)); | 468 | ret = platform_add_devices(devices, ARRAY_SIZE(devices)); |