aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/pxa3xx.c
diff options
context:
space:
mode:
authorEric Miao <eric.y.miao@gmail.com>2010-11-21 20:41:39 -0500
committerEric Miao <eric.y.miao@gmail.com>2010-12-16 01:31:19 -0500
commit2e8581e756ddbd0dea8b0d4059e9a82d2929de01 (patch)
tree0dcae8c0023c749c776737a84a4e0efa62efe9f1 /arch/arm/mach-pxa/pxa3xx.c
parentbb71bdd31b48efa2b9834f1a47eb5f657e3c217c (diff)
ARM: pxa: replace duplicated macro DEFINE_PXA3_CK() with DEFINE_CK()
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/pxa3xx.c')
-rw-r--r--arch/arm/mach-pxa/pxa3xx.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c
index dc658ad234e1..a0b123c99a4d 100644
--- a/arch/arm/mach-pxa/pxa3xx.c
+++ b/arch/arm/mach-pxa/pxa3xx.c
@@ -216,9 +216,6 @@ static struct clk clk_dummy = {
216 .ops = &clk_dummy_ops, 216 .ops = &clk_dummy_ops,
217}; 217};
218 218
219static DEFINE_PXA3_CK(pxa3xx_lcd, LCD, &clk_pxa3xx_hsio_ops);
220static DEFINE_PXA3_CK(pxa3xx_camera, CAMERA, &clk_pxa3xx_hsio_ops);
221static DEFINE_PXA3_CK(pxa3xx_ac97, AC97, &clk_pxa3xx_ac97_ops);
222static DEFINE_PXA3_CKEN(pxa3xx_ffuart, FFUART, 14857000, 1); 219static DEFINE_PXA3_CKEN(pxa3xx_ffuart, FFUART, 14857000, 1);
223static DEFINE_PXA3_CKEN(pxa3xx_btuart, BTUART, 14857000, 1); 220static DEFINE_PXA3_CKEN(pxa3xx_btuart, BTUART, 14857000, 1);
224static DEFINE_PXA3_CKEN(pxa3xx_stuart, STUART, 14857000, 1); 221static DEFINE_PXA3_CKEN(pxa3xx_stuart, STUART, 14857000, 1);
@@ -236,6 +233,10 @@ static DEFINE_PXA3_CKEN(pxa3xx_pwm1, PWM1, 13000000, 0);
236static DEFINE_PXA3_CKEN(pxa3xx_mmc1, MMC1, 19500000, 0); 233static DEFINE_PXA3_CKEN(pxa3xx_mmc1, MMC1, 19500000, 0);
237static DEFINE_PXA3_CKEN(pxa3xx_mmc2, MMC2, 19500000, 0); 234static DEFINE_PXA3_CKEN(pxa3xx_mmc2, MMC2, 19500000, 0);
238 235
236static DEFINE_CK(pxa3xx_lcd, LCD, &clk_pxa3xx_hsio_ops);
237static DEFINE_CK(pxa3xx_camera, CAMERA, &clk_pxa3xx_hsio_ops);
238static DEFINE_CK(pxa3xx_ac97, AC97, &clk_pxa3xx_ac97_ops);
239
239static struct clk_lookup pxa3xx_clkregs[] = { 240static struct clk_lookup pxa3xx_clkregs[] = {
240 INIT_CLKREG(&clk_pxa3xx_pout, NULL, "CLK_POUT"), 241 INIT_CLKREG(&clk_pxa3xx_pout, NULL, "CLK_POUT"),
241 /* Power I2C clock is always on */ 242 /* Power I2C clock is always on */