diff options
| author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2012-02-20 23:54:57 -0500 |
|---|---|---|
| committer | Haojian Zhuang <haojian.zhuang@marvell.com> | 2012-02-27 21:13:34 -0500 |
| commit | 3e12ec7714e77010539749bfed5ea11c166095d3 (patch) | |
| tree | ee423193c49f40b3662ace7a14313c92e7574588 | |
| parent | 4a8f83409da6be1085b3c8f52538c1427ef2c0f1 (diff) | |
ARM: pxa: add rtc dummy clock
sa1100-rtc driver could be shared among sa1100/pxa/mmp series silicon.
Since clk is used in mmp series silicon, add dummy clock support in
pxa also.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
| -rw-r--r-- | arch/arm/mach-pxa/pxa25x.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/pxa27x.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/pxa3xx.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/pxa95x.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 91e4f6c03766..d43c1a7a7fd9 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c | |||
| @@ -209,6 +209,7 @@ static struct clk_lookup pxa25x_clkregs[] = { | |||
| 209 | INIT_CLKREG(&clk_pxa25x_gpio11, NULL, "GPIO11_CLK"), | 209 | INIT_CLKREG(&clk_pxa25x_gpio11, NULL, "GPIO11_CLK"), |
| 210 | INIT_CLKREG(&clk_pxa25x_gpio12, NULL, "GPIO12_CLK"), | 210 | INIT_CLKREG(&clk_pxa25x_gpio12, NULL, "GPIO12_CLK"), |
| 211 | INIT_CLKREG(&clk_pxa25x_mem, "pxa2xx-pcmcia", NULL), | 211 | INIT_CLKREG(&clk_pxa25x_mem, "pxa2xx-pcmcia", NULL), |
| 212 | INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL), | ||
| 212 | }; | 213 | }; |
| 213 | 214 | ||
| 214 | static struct clk_lookup pxa25x_hwuart_clkreg = | 215 | static struct clk_lookup pxa25x_hwuart_clkreg = |
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index aed6cbcf3866..cf2f9d14a80c 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c | |||
| @@ -230,6 +230,7 @@ static struct clk_lookup pxa27x_clkregs[] = { | |||
| 230 | INIT_CLKREG(&clk_pxa27x_im, NULL, "IMCLK"), | 230 | INIT_CLKREG(&clk_pxa27x_im, NULL, "IMCLK"), |
| 231 | INIT_CLKREG(&clk_pxa27x_memc, NULL, "MEMCLK"), | 231 | INIT_CLKREG(&clk_pxa27x_memc, NULL, "MEMCLK"), |
| 232 | INIT_CLKREG(&clk_pxa27x_mem, "pxa2xx-pcmcia", NULL), | 232 | INIT_CLKREG(&clk_pxa27x_mem, "pxa2xx-pcmcia", NULL), |
| 233 | INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL), | ||
| 233 | }; | 234 | }; |
| 234 | 235 | ||
| 235 | #ifdef CONFIG_PM | 236 | #ifdef CONFIG_PM |
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index 4f402afa6609..881934899bda 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c | |||
| @@ -89,6 +89,7 @@ static struct clk_lookup pxa3xx_clkregs[] = { | |||
| 89 | INIT_CLKREG(&clk_pxa3xx_mmc2, "pxa2xx-mci.1", NULL), | 89 | INIT_CLKREG(&clk_pxa3xx_mmc2, "pxa2xx-mci.1", NULL), |
| 90 | INIT_CLKREG(&clk_pxa3xx_smemc, "pxa2xx-pcmcia", NULL), | 90 | INIT_CLKREG(&clk_pxa3xx_smemc, "pxa2xx-pcmcia", NULL), |
| 91 | 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), | ||
| 92 | }; | 93 | }; |
| 93 | 94 | ||
| 94 | #ifdef CONFIG_PM | 95 | #ifdef CONFIG_PM |
diff --git a/arch/arm/mach-pxa/pxa95x.c b/arch/arm/mach-pxa/pxa95x.c index d082a583df78..35023d7d3cd4 100644 --- a/arch/arm/mach-pxa/pxa95x.c +++ b/arch/arm/mach-pxa/pxa95x.c | |||
| @@ -231,6 +231,7 @@ static struct clk_lookup pxa95x_clkregs[] = { | |||
| 231 | INIT_CLKREG(&clk_pxa95x_pwm0, "pxa27x-pwm.0", NULL), | 231 | INIT_CLKREG(&clk_pxa95x_pwm0, "pxa27x-pwm.0", NULL), |
| 232 | INIT_CLKREG(&clk_pxa95x_pwm1, "pxa27x-pwm.1", NULL), | 232 | INIT_CLKREG(&clk_pxa95x_pwm1, "pxa27x-pwm.1", NULL), |
| 233 | INIT_CLKREG(&clk_pxa95x_gpio, "pxa-gpio", NULL), | 233 | INIT_CLKREG(&clk_pxa95x_gpio, "pxa-gpio", NULL), |
| 234 | INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL), | ||
| 234 | }; | 235 | }; |
| 235 | 236 | ||
| 236 | void __init pxa95x_init_irq(void) | 237 | void __init pxa95x_init_irq(void) |
