diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2012-07-16 18:52:03 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-07-16 18:52:03 -0400 |
commit | 8bf56466414aef011983d96ef401fe3ad75cfc29 (patch) | |
tree | bce3f81105bf653fd83faa68b11029d852b9c3d2 /arch/arm/mach-exynos/clock-exynos4210.c | |
parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) |
ARM: EXYNOS: Move G2D clock entries to clock-exynos4210.c file
G2D clock registers are different in EXYNOS4210 and EXYNOS4X12 SoCs.
Hence moving the SoC specific G2D clock entries from common clock file
(clock-exynos4.c) to EXYNOS4210 specific clock file (clock-exynos4210.c).
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-exynos/clock-exynos4210.c')
-rw-r--r-- | arch/arm/mach-exynos/clock-exynos4210.c | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/clock-exynos4210.c b/arch/arm/mach-exynos/clock-exynos4210.c index b8689ff60baf..fed4c26e9dad 100644 --- a/arch/arm/mach-exynos/clock-exynos4210.c +++ b/arch/arm/mach-exynos/clock-exynos4210.c | |||
@@ -48,6 +48,32 @@ static struct clksrc_clk *sysclks[] = { | |||
48 | /* nothing here yet */ | 48 | /* nothing here yet */ |
49 | }; | 49 | }; |
50 | 50 | ||
51 | static struct clksrc_clk exynos4210_clk_mout_g2d0 = { | ||
52 | .clk = { | ||
53 | .name = "mout_g2d0", | ||
54 | }, | ||
55 | .sources = &exynos4_clkset_mout_g2d0, | ||
56 | .reg_src = { .reg = EXYNOS4_CLKSRC_IMAGE, .shift = 0, .size = 1 }, | ||
57 | }; | ||
58 | |||
59 | static struct clksrc_clk exynos4210_clk_mout_g2d1 = { | ||
60 | .clk = { | ||
61 | .name = "mout_g2d1", | ||
62 | }, | ||
63 | .sources = &exynos4_clkset_mout_g2d1, | ||
64 | .reg_src = { .reg = EXYNOS4_CLKSRC_IMAGE, .shift = 4, .size = 1 }, | ||
65 | }; | ||
66 | |||
67 | static struct clk *exynos4210_clkset_mout_g2d_list[] = { | ||
68 | [0] = &exynos4210_clk_mout_g2d0.clk, | ||
69 | [1] = &exynos4210_clk_mout_g2d1.clk, | ||
70 | }; | ||
71 | |||
72 | static struct clksrc_sources exynos4210_clkset_mout_g2d = { | ||
73 | .sources = exynos4210_clkset_mout_g2d_list, | ||
74 | .nr_sources = ARRAY_SIZE(exynos4210_clkset_mout_g2d_list), | ||
75 | }; | ||
76 | |||
51 | static int exynos4_clksrc_mask_lcd1_ctrl(struct clk *clk, int enable) | 77 | static int exynos4_clksrc_mask_lcd1_ctrl(struct clk *clk, int enable) |
52 | { | 78 | { |
53 | return s5p_gatectrl(EXYNOS4210_CLKSRC_MASK_LCD1, clk, enable); | 79 | return s5p_gatectrl(EXYNOS4210_CLKSRC_MASK_LCD1, clk, enable); |
@@ -74,6 +100,13 @@ static struct clksrc_clk clksrcs[] = { | |||
74 | .sources = &exynos4_clkset_group, | 100 | .sources = &exynos4_clkset_group, |
75 | .reg_src = { .reg = EXYNOS4210_CLKSRC_LCD1, .shift = 0, .size = 4 }, | 101 | .reg_src = { .reg = EXYNOS4210_CLKSRC_LCD1, .shift = 0, .size = 4 }, |
76 | .reg_div = { .reg = EXYNOS4210_CLKDIV_LCD1, .shift = 0, .size = 4 }, | 102 | .reg_div = { .reg = EXYNOS4210_CLKDIV_LCD1, .shift = 0, .size = 4 }, |
103 | }, { | ||
104 | .clk = { | ||
105 | .name = "sclk_fimg2d", | ||
106 | }, | ||
107 | .sources = &exynos4210_clkset_mout_g2d, | ||
108 | .reg_src = { .reg = EXYNOS4_CLKSRC_IMAGE, .shift = 8, .size = 1 }, | ||
109 | .reg_div = { .reg = EXYNOS4_CLKDIV_IMAGE, .shift = 0, .size = 4 }, | ||
77 | }, | 110 | }, |
78 | }; | 111 | }; |
79 | 112 | ||
@@ -105,6 +138,10 @@ static struct clk init_clocks_off[] = { | |||
105 | .devname = SYSMMU_CLOCK_DEVNAME(fimd1, 11), | 138 | .devname = SYSMMU_CLOCK_DEVNAME(fimd1, 11), |
106 | .enable = exynos4_clk_ip_lcd1_ctrl, | 139 | .enable = exynos4_clk_ip_lcd1_ctrl, |
107 | .ctrlbit = (1 << 4), | 140 | .ctrlbit = (1 << 4), |
141 | }, { | ||
142 | .name = "fimg2d", | ||
143 | .enable = exynos4_clk_ip_image_ctrl, | ||
144 | .ctrlbit = (1 << 0), | ||
108 | }, | 145 | }, |
109 | }; | 146 | }; |
110 | 147 | ||