aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clk/samsung
diff options
context:
space:
mode:
authorTomasz Figa <t.figa@samsung.com>2013-10-15 13:41:18 -0400
committerTomasz Figa <t.figa@samsung.com>2013-12-30 12:15:48 -0500
commit3818f11740bbf87ad76f4f502f6739c8d62e5c17 (patch)
tree19cc5c3a76f11607db73d0bf500ea4da0f788de9 /drivers/clk/samsung
parent796d1f4cd62500ee55a645f2649b546710b11bd1 (diff)
clk: samsung: exynos5250: Fix parent of gate clocks from DISP1 domain
This patch adds mux_aclk_200_disp1_sub mux clock, which according to SoC documentation is the correct parent of DISP1 gate clocks. Signed-off-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Tested-by: Tomasz Figa <t.figa@samsung.com>
Diffstat (limited to 'drivers/clk/samsung')
-rw-r--r--drivers/clk/samsung/clk-exynos5250.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/clk/samsung/clk-exynos5250.c b/drivers/clk/samsung/clk-exynos5250.c
index 6c1677ccef70..d29faabd2150 100644
--- a/drivers/clk/samsung/clk-exynos5250.c
+++ b/drivers/clk/samsung/clk-exynos5250.c
@@ -197,6 +197,7 @@ PNAME(mout_mpll_user_p) = { "fin_pll", "mout_mpll" };
197PNAME(mout_bpll_user_p) = { "fin_pll", "mout_bpll" }; 197PNAME(mout_bpll_user_p) = { "fin_pll", "mout_bpll" };
198PNAME(mout_aclk166_p) = { "mout_cpll", "mout_mpll_user" }; 198PNAME(mout_aclk166_p) = { "mout_cpll", "mout_mpll_user" };
199PNAME(mout_aclk200_p) = { "mout_mpll_user", "mout_bpll_user" }; 199PNAME(mout_aclk200_p) = { "mout_mpll_user", "mout_bpll_user" };
200PNAME(mout_aclk200_sub_p) = { "fin_pll", "div_aclk200" };
200PNAME(mout_aclk266_sub_p) = { "fin_pll", "div_aclk266" }; 201PNAME(mout_aclk266_sub_p) = { "fin_pll", "div_aclk266" };
201PNAME(mout_hdmi_p) = { "div_hdmi_pixel", "sclk_hdmiphy" }; 202PNAME(mout_hdmi_p) = { "div_hdmi_pixel", "sclk_hdmiphy" };
202PNAME(mout_usb3_p) = { "mout_mpll_user", "mout_cpll" }; 203PNAME(mout_usb3_p) = { "mout_mpll_user", "mout_cpll" };
@@ -273,6 +274,7 @@ static struct samsung_mux_clock exynos5250_mux_clks[] __initdata = {
273 MUX(none, "mout_mpll_user", mout_mpll_user_p, SRC_TOP2, 20, 1), 274 MUX(none, "mout_mpll_user", mout_mpll_user_p, SRC_TOP2, 20, 1),
274 MUX(none, "mout_bpll_user", mout_bpll_user_p, SRC_TOP2, 24, 1), 275 MUX(none, "mout_bpll_user", mout_bpll_user_p, SRC_TOP2, 24, 1),
275 276
277 MUX(none, "mout_aclk200_disp1_sub", mout_aclk200_sub_p, SRC_TOP3, 4, 1),
276 MUX(none, "mout_aclk266_gscl_sub", mout_aclk266_sub_p, SRC_TOP3, 8, 1), 278 MUX(none, "mout_aclk266_gscl_sub", mout_aclk266_sub_p, SRC_TOP3, 8, 1),
277 279
278 MUX(none, "mout_cam_bayer", mout_group1_p, SRC_GSCL, 12, 4), 280 MUX(none, "mout_cam_bayer", mout_group1_p, SRC_GSCL, 12, 4),
@@ -503,12 +505,12 @@ static struct samsung_gate_clock exynos5250_gate_clks[] __initdata = {
503 GATE(smmu_gscl3, "smmu_gscl3", "mout_aclk266_gscl_sub", 505 GATE(smmu_gscl3, "smmu_gscl3", "mout_aclk266_gscl_sub",
504 GATE_IP_GSCL, 10, 0, 0), 506 GATE_IP_GSCL, 10, 0, 0),
505 507
506 GATE(fimd1, "fimd1", "div_aclk200", GATE_IP_DISP1, 0, 0, 0), 508 GATE(fimd1, "fimd1", "mout_aclk200_disp1_sub", GATE_IP_DISP1, 0, 0, 0),
507 GATE(mie1, "mie1", "div_aclk200", GATE_IP_DISP1, 1, 0, 0), 509 GATE(mie1, "mie1", "mout_aclk200_disp1_sub", GATE_IP_DISP1, 1, 0, 0),
508 GATE(dsim0, "dsim0", "div_aclk200", GATE_IP_DISP1, 3, 0, 0), 510 GATE(dsim0, "dsim0", "mout_aclk200_disp1_sub", GATE_IP_DISP1, 3, 0, 0),
509 GATE(dp, "dp", "div_aclk200", GATE_IP_DISP1, 4, 0, 0), 511 GATE(dp, "dp", "mout_aclk200_disp1_sub", GATE_IP_DISP1, 4, 0, 0),
510 GATE(mixer, "mixer", "mout_aclk200_disp1", GATE_IP_DISP1, 5, 0, 0), 512 GATE(mixer, "mixer", "mout_aclk200_disp1_sub", GATE_IP_DISP1, 5, 0, 0),
511 GATE(hdmi, "hdmi", "mout_aclk200_disp1", GATE_IP_DISP1, 6, 0, 0), 513 GATE(hdmi, "hdmi", "mout_aclk200_disp1_sub", GATE_IP_DISP1, 6, 0, 0),
512 514
513 GATE(mfc, "mfc", "div_aclk333", GATE_IP_MFC, 0, 0, 0), 515 GATE(mfc, "mfc", "div_aclk333", GATE_IP_MFC, 0, 0, 0),
514 GATE(smmu_mfcr, "smmu_mfcr", "div_aclk333", GATE_IP_MFC, 1, 0, 0), 516 GATE(smmu_mfcr, "smmu_mfcr", "div_aclk333", GATE_IP_MFC, 1, 0, 0),