diff options
author | Daniel Mack <daniel@caiaq.de> | 2009-07-09 13:04:48 -0400 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2009-09-10 06:49:26 -0400 |
commit | f0f04f0840e41411895056bece50bfbd5dfc81cc (patch) | |
tree | 315739863972944152a458edcd96f7c882622e95 /arch | |
parent | d2c37068429b29d6549cf3486fc84b836689e122 (diff) |
[ARM] pxa: add clock definition for graphics controller
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pxa3xx-regs.h | 4 | ||||
-rw-r--r-- | arch/arm/mach-pxa/pxa300.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/pxa320.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h b/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h index 7d1a059b3d43..e91d63cfe811 100644 --- a/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h +++ b/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h | |||
@@ -208,7 +208,7 @@ | |||
208 | #define CKEN_MVED 43 /* < MVED clock enable */ | 208 | #define CKEN_MVED 43 /* < MVED clock enable */ |
209 | 209 | ||
210 | /* Note: GCU clock enable bit differs on PXA300/PXA310 and PXA320 */ | 210 | /* Note: GCU clock enable bit differs on PXA300/PXA310 and PXA320 */ |
211 | #define PXA300_CKEN_GRAPHICS 42 /* Graphics controller clock enable */ | 211 | #define CKEN_PXA300_GCU 42 /* Graphics controller clock enable */ |
212 | #define PXA320_CKEN_GRAPHICS 7 /* Graphics controller clock enable */ | 212 | #define CKEN_PXA320_GCU 7 /* Graphics controller clock enable */ |
213 | 213 | ||
214 | #endif /* __ASM_ARCH_PXA3XX_REGS_H */ | 214 | #endif /* __ASM_ARCH_PXA3XX_REGS_H */ |
diff --git a/arch/arm/mach-pxa/pxa300.c b/arch/arm/mach-pxa/pxa300.c index 4ba6d21f851c..f4af6e2bef89 100644 --- a/arch/arm/mach-pxa/pxa300.c +++ b/arch/arm/mach-pxa/pxa300.c | |||
@@ -84,9 +84,11 @@ static struct mfp_addr_map pxa310_mfp_addr_map[] __initdata = { | |||
84 | }; | 84 | }; |
85 | 85 | ||
86 | static DEFINE_PXA3_CKEN(common_nand, NAND, 156000000, 0); | 86 | static DEFINE_PXA3_CKEN(common_nand, NAND, 156000000, 0); |
87 | static DEFINE_PXA3_CKEN(gcu, PXA300_GCU, 0, 0); | ||
87 | 88 | ||
88 | static struct clk_lookup common_clkregs[] = { | 89 | static struct clk_lookup common_clkregs[] = { |
89 | INIT_CLKREG(&clk_common_nand, "pxa3xx-nand", NULL), | 90 | INIT_CLKREG(&clk_common_nand, "pxa3xx-nand", NULL), |
91 | INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL), | ||
90 | }; | 92 | }; |
91 | 93 | ||
92 | static DEFINE_PXA3_CKEN(pxa310_mmc3, MMC3, 19500000, 0); | 94 | static DEFINE_PXA3_CKEN(pxa310_mmc3, MMC3, 19500000, 0); |
diff --git a/arch/arm/mach-pxa/pxa320.c b/arch/arm/mach-pxa/pxa320.c index 8b3d97efadab..c7373e74a109 100644 --- a/arch/arm/mach-pxa/pxa320.c +++ b/arch/arm/mach-pxa/pxa320.c | |||
@@ -78,9 +78,11 @@ static struct mfp_addr_map pxa320_mfp_addr_map[] __initdata = { | |||
78 | }; | 78 | }; |
79 | 79 | ||
80 | static DEFINE_PXA3_CKEN(pxa320_nand, NAND, 104000000, 0); | 80 | static DEFINE_PXA3_CKEN(pxa320_nand, NAND, 104000000, 0); |
81 | static DEFINE_PXA3_CKEN(gcu, PXA320_GCU, 0, 0); | ||
81 | 82 | ||
82 | static struct clk_lookup pxa320_clkregs[] = { | 83 | static struct clk_lookup pxa320_clkregs[] = { |
83 | INIT_CLKREG(&clk_pxa320_nand, "pxa3xx-nand", NULL), | 84 | INIT_CLKREG(&clk_pxa320_nand, "pxa3xx-nand", NULL), |
85 | INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL), | ||
84 | }; | 86 | }; |
85 | 87 | ||
86 | static int __init pxa320_init(void) | 88 | static int __init pxa320_init(void) |