diff options
author | Tomasz Figa <t.figa@samsung.com> | 2013-04-04 00:35:18 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-04-04 02:51:16 -0400 |
commit | 7406ee7c2a31c0fad0d8062de93fcb58d1fa498c (patch) | |
tree | 4ed2d5af045b2e2841a04ace4704a8d075bf9a9a | |
parent | 0f1fce908efb2aa76b713d424b422f117376a04a (diff) |
clk: exynos4: Add E4210 prefix to LCD1 clock registers
This patch adds E4210 prefix to all registers related to LCD1 clock
domain, because they are present only on Exynos4210.
Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: Thomas Abraham <thomas.abraham@linaro.org>
Acked-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r-- | drivers/clk/samsung/clk-exynos4.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/clk/samsung/clk-exynos4.c b/drivers/clk/samsung/clk-exynos4.c index 7ae0a0560354..3d8a8a6fc5d0 100644 --- a/drivers/clk/samsung/clk-exynos4.c +++ b/drivers/clk/samsung/clk-exynos4.c | |||
@@ -41,7 +41,7 @@ | |||
41 | #define SRC_G3D 0xc22c | 41 | #define SRC_G3D 0xc22c |
42 | #define E4210_SRC_IMAGE 0xc230 | 42 | #define E4210_SRC_IMAGE 0xc230 |
43 | #define SRC_LCD0 0xc234 | 43 | #define SRC_LCD0 0xc234 |
44 | #define SRC_LCD1 0xc238 | 44 | #define E4210_SRC_LCD1 0xc238 |
45 | #define E4X12_SRC_ISP 0xc238 | 45 | #define E4X12_SRC_ISP 0xc238 |
46 | #define SRC_MAUDIO 0xc23c | 46 | #define SRC_MAUDIO 0xc23c |
47 | #define SRC_FSYS 0xc240 | 47 | #define SRC_FSYS 0xc240 |
@@ -51,7 +51,7 @@ | |||
51 | #define SRC_MASK_CAM 0xc320 | 51 | #define SRC_MASK_CAM 0xc320 |
52 | #define SRC_MASK_TV 0xc324 | 52 | #define SRC_MASK_TV 0xc324 |
53 | #define SRC_MASK_LCD0 0xc334 | 53 | #define SRC_MASK_LCD0 0xc334 |
54 | #define SRC_MASK_LCD1 0xc338 | 54 | #define E4210_SRC_MASK_LCD1 0xc338 |
55 | #define E4X12_SRC_MASK_ISP 0xc338 | 55 | #define E4X12_SRC_MASK_ISP 0xc338 |
56 | #define SRC_MASK_MAUDIO 0xc33c | 56 | #define SRC_MASK_MAUDIO 0xc33c |
57 | #define SRC_MASK_FSYS 0xc340 | 57 | #define SRC_MASK_FSYS 0xc340 |
@@ -85,7 +85,7 @@ | |||
85 | #define GATE_IP_G3D 0xc92c | 85 | #define GATE_IP_G3D 0xc92c |
86 | #define E4210_GATE_IP_IMAGE 0xc930 | 86 | #define E4210_GATE_IP_IMAGE 0xc930 |
87 | #define GATE_IP_LCD0 0xc934 | 87 | #define GATE_IP_LCD0 0xc934 |
88 | #define GATE_IP_LCD1 0xc938 | 88 | #define E4210_GATE_IP_LCD1 0xc938 |
89 | #define E4X12_GATE_IP_ISP 0xc938 | 89 | #define E4X12_GATE_IP_ISP 0xc938 |
90 | #define E4X12_GATE_IP_MAUDIO 0xc93c | 90 | #define E4X12_GATE_IP_MAUDIO 0xc93c |
91 | #define GATE_IP_FSYS 0xc940 | 91 | #define GATE_IP_FSYS 0xc940 |
@@ -326,8 +326,8 @@ struct samsung_mux_clock exynos4210_mux_clks[] __initdata = { | |||
326 | MUX(none, "mout_g2d0", sclk_ampll_p4210, E4210_SRC_IMAGE, 0, 1), | 326 | MUX(none, "mout_g2d0", sclk_ampll_p4210, E4210_SRC_IMAGE, 0, 1), |
327 | MUX(none, "mout_g2d1", sclk_evpll_p, E4210_SRC_IMAGE, 4, 1), | 327 | MUX(none, "mout_g2d1", sclk_evpll_p, E4210_SRC_IMAGE, 4, 1), |
328 | MUX(none, "mout_g2d", mout_g2d_p, E4210_SRC_IMAGE, 8, 1), | 328 | MUX(none, "mout_g2d", mout_g2d_p, E4210_SRC_IMAGE, 8, 1), |
329 | MUX(none, "mout_fimd1", group1_p4210, SRC_LCD1, 0, 4), | 329 | MUX(none, "mout_fimd1", group1_p4210, E4210_SRC_LCD1, 0, 4), |
330 | MUX(none, "mout_mipi1", group1_p4210, SRC_LCD1, 12, 4), | 330 | MUX(none, "mout_mipi1", group1_p4210, E4210_SRC_LCD1, 12, 4), |
331 | MUX_A(sclk_mpll, "sclk_mpll", mout_mpll_p, SRC_CPU, 8, 1, "sclk_mpll"), | 331 | MUX_A(sclk_mpll, "sclk_mpll", mout_mpll_p, SRC_CPU, 8, 1, "sclk_mpll"), |
332 | MUX_A(mout_core, "mout_core", mout_core_p4210, | 332 | MUX_A(mout_core, "mout_core", mout_core_p4210, |
333 | SRC_CPU, 16, 1, "mout_core"), | 333 | SRC_CPU, 16, 1, "mout_core"), |
@@ -538,10 +538,10 @@ struct samsung_gate_clock exynos4_gate_clks[] __initdata = { | |||
538 | GATE(jpeg, "jpeg", "aclk160", GATE_IP_CAM, 6, 0, 0), | 538 | GATE(jpeg, "jpeg", "aclk160", GATE_IP_CAM, 6, 0, 0), |
539 | GATE(mie0, "mie0", "aclk160", GATE_IP_LCD0, 1, 0, 0), | 539 | GATE(mie0, "mie0", "aclk160", GATE_IP_LCD0, 1, 0, 0), |
540 | GATE(dsim0, "dsim0", "aclk160", GATE_IP_LCD0, 3, 0, 0), | 540 | GATE(dsim0, "dsim0", "aclk160", GATE_IP_LCD0, 3, 0, 0), |
541 | GATE(fimd1, "fimd1", "aclk160", GATE_IP_LCD1, 0, 0, 0), | 541 | GATE(fimd1, "fimd1", "aclk160", E4210_GATE_IP_LCD1, 0, 0, 0), |
542 | GATE(mie1, "mie1", "aclk160", GATE_IP_LCD1, 1, 0, 0), | 542 | GATE(mie1, "mie1", "aclk160", E4210_GATE_IP_LCD1, 1, 0, 0), |
543 | GATE(dsim1, "dsim1", "aclk160", GATE_IP_LCD1, 3, 0, 0), | 543 | GATE(dsim1, "dsim1", "aclk160", E4210_GATE_IP_LCD1, 3, 0, 0), |
544 | GATE(smmu_fimd1, "smmu_fimd1", "aclk160", GATE_IP_LCD1, 4, 0, 0), | 544 | GATE(smmu_fimd1, "smmu_fimd1", "aclk160", E4210_GATE_IP_LCD1, 4, 0, 0), |
545 | GATE(tsi, "tsi", "aclk133", GATE_IP_FSYS, 4, 0, 0), | 545 | GATE(tsi, "tsi", "aclk133", GATE_IP_FSYS, 4, 0, 0), |
546 | GATE(sromc, "sromc", "aclk133", GATE_IP_FSYS, 11, 0, 0), | 546 | GATE(sromc, "sromc", "aclk133", GATE_IP_FSYS, 11, 0, 0), |
547 | GATE(sclk_g3d, "sclk_g3d", "div_g3d", GATE_IP_G3D, 0, | 547 | GATE(sclk_g3d, "sclk_g3d", "div_g3d", GATE_IP_G3D, 0, |
@@ -738,7 +738,7 @@ struct samsung_gate_clock exynos4210_gate_clks[] __initdata = { | |||
738 | GATE(smmu_rotator, "smmu_rotator", "aclk200", | 738 | GATE(smmu_rotator, "smmu_rotator", "aclk200", |
739 | E4210_GATE_IP_IMAGE, 4, 0, 0), | 739 | E4210_GATE_IP_IMAGE, 4, 0, 0), |
740 | GATE(sclk_mipi1, "sclk_mipi1", "div_mipi_pre1", | 740 | GATE(sclk_mipi1, "sclk_mipi1", "div_mipi_pre1", |
741 | SRC_MASK_LCD1, 12, CLK_SET_RATE_PARENT, 0), | 741 | E4210_SRC_MASK_LCD1, 12, CLK_SET_RATE_PARENT, 0), |
742 | GATE(sclk_sata, "sclk_sata", "div_sata", | 742 | GATE(sclk_sata, "sclk_sata", "div_sata", |
743 | SRC_MASK_FSYS, 24, CLK_SET_RATE_PARENT, 0), | 743 | SRC_MASK_FSYS, 24, CLK_SET_RATE_PARENT, 0), |
744 | GATE(sclk_mixer, "sclk_mixer", "mout_mixer", SRC_MASK_TV, 4, 0, 0), | 744 | GATE(sclk_mixer, "sclk_mixer", "mout_mixer", SRC_MASK_TV, 4, 0, 0), |
@@ -749,7 +749,7 @@ struct samsung_gate_clock exynos4210_gate_clks[] __initdata = { | |||
749 | GATE_A(rtc, "rtc", "aclk100", GATE_IP_PERIR, 15, 0, 0, "rtc"), | 749 | GATE_A(rtc, "rtc", "aclk100", GATE_IP_PERIR, 15, 0, 0, "rtc"), |
750 | GATE_A(keyif, "keyif", "aclk100", GATE_IP_PERIR, 16, 0, 0, "keypad"), | 750 | GATE_A(keyif, "keyif", "aclk100", GATE_IP_PERIR, 16, 0, 0, "keypad"), |
751 | GATE_DA(sclk_fimd1, "exynos4-fb.1", "sclk_fimd1", "div_fimd1", | 751 | GATE_DA(sclk_fimd1, "exynos4-fb.1", "sclk_fimd1", "div_fimd1", |
752 | SRC_MASK_LCD1, 0, CLK_SET_RATE_PARENT, 0, "sclk_fimd"), | 752 | E4210_SRC_MASK_LCD1, 0, CLK_SET_RATE_PARENT, 0, "sclk_fimd"), |
753 | }; | 753 | }; |
754 | 754 | ||
755 | /* list of gate clocks supported in exynos4x12 soc */ | 755 | /* list of gate clocks supported in exynos4x12 soc */ |