diff options
author | Tomasz Figa <t.figa@samsung.com> | 2013-10-15 13:41:21 -0400 |
---|---|---|
committer | Tomasz Figa <t.figa@samsung.com> | 2013-12-30 12:15:49 -0500 |
commit | 96987ded8fd6e4b19fdac69950acfaeccd681952 (patch) | |
tree | 52f80f05995803e8013d73a0358280f6ad453383 /drivers/clk/samsung | |
parent | bfeb9f274b128833eedcdea9779042e49cf4fa85 (diff) |
clk: samsung: exynos5250: Fix parents of gate clocks from MFC domain
This patch adds mout_aclk333_sub mux clock and updates gate clocks from
MFC domain to have it as their parent as specified in SoC documentation.
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.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/clk/samsung/clk-exynos5250.c b/drivers/clk/samsung/clk-exynos5250.c index 220aa3a5ba74..d54f4212d4e9 100644 --- a/drivers/clk/samsung/clk-exynos5250.c +++ b/drivers/clk/samsung/clk-exynos5250.c | |||
@@ -199,6 +199,7 @@ PNAME(mout_aclk166_p) = { "mout_cpll", "mout_mpll_user" }; | |||
199 | PNAME(mout_aclk200_p) = { "mout_mpll_user", "mout_bpll_user" }; | 199 | PNAME(mout_aclk200_p) = { "mout_mpll_user", "mout_bpll_user" }; |
200 | PNAME(mout_aclk200_sub_p) = { "fin_pll", "div_aclk200" }; | 200 | PNAME(mout_aclk200_sub_p) = { "fin_pll", "div_aclk200" }; |
201 | PNAME(mout_aclk266_sub_p) = { "fin_pll", "div_aclk266" }; | 201 | PNAME(mout_aclk266_sub_p) = { "fin_pll", "div_aclk266" }; |
202 | PNAME(mout_aclk333_sub_p) = { "fin_pll", "div_aclk333" }; | ||
202 | PNAME(mout_hdmi_p) = { "div_hdmi_pixel", "sclk_hdmiphy" }; | 203 | PNAME(mout_hdmi_p) = { "div_hdmi_pixel", "sclk_hdmiphy" }; |
203 | PNAME(mout_usb3_p) = { "mout_mpll_user", "mout_cpll" }; | 204 | PNAME(mout_usb3_p) = { "mout_mpll_user", "mout_cpll" }; |
204 | PNAME(mout_group1_p) = { "fin_pll", "fin_pll", "sclk_hdmi27m", | 205 | PNAME(mout_group1_p) = { "fin_pll", "fin_pll", "sclk_hdmi27m", |
@@ -284,6 +285,7 @@ static struct samsung_mux_clock exynos5250_mux_clks[] __initdata = { | |||
284 | 285 | ||
285 | MUX(none, "mout_aclk200_disp1_sub", mout_aclk200_sub_p, SRC_TOP3, 4, 1), | 286 | MUX(none, "mout_aclk200_disp1_sub", mout_aclk200_sub_p, SRC_TOP3, 4, 1), |
286 | MUX(none, "mout_aclk266_gscl_sub", mout_aclk266_sub_p, SRC_TOP3, 8, 1), | 287 | MUX(none, "mout_aclk266_gscl_sub", mout_aclk266_sub_p, SRC_TOP3, 8, 1), |
288 | MUX(none, "mout_aclk333_sub", mout_aclk333_sub_p, SRC_TOP3, 24, 1), | ||
287 | 289 | ||
288 | MUX(none, "mout_cam_bayer", mout_group1_p, SRC_GSCL, 12, 4), | 290 | MUX(none, "mout_cam_bayer", mout_group1_p, SRC_GSCL, 12, 4), |
289 | MUX(none, "mout_cam0", mout_group1_p, SRC_GSCL, 16, 4), | 291 | MUX(none, "mout_cam0", mout_group1_p, SRC_GSCL, 16, 4), |
@@ -520,9 +522,9 @@ static struct samsung_gate_clock exynos5250_gate_clks[] __initdata = { | |||
520 | GATE(mixer, "mixer", "mout_aclk200_disp1_sub", GATE_IP_DISP1, 5, 0, 0), | 522 | GATE(mixer, "mixer", "mout_aclk200_disp1_sub", GATE_IP_DISP1, 5, 0, 0), |
521 | GATE(hdmi, "hdmi", "mout_aclk200_disp1_sub", GATE_IP_DISP1, 6, 0, 0), | 523 | GATE(hdmi, "hdmi", "mout_aclk200_disp1_sub", GATE_IP_DISP1, 6, 0, 0), |
522 | 524 | ||
523 | GATE(mfc, "mfc", "div_aclk333", GATE_IP_MFC, 0, 0, 0), | 525 | GATE(mfc, "mfc", "mout_aclk333_sub", GATE_IP_MFC, 0, 0, 0), |
524 | GATE(smmu_mfcr, "smmu_mfcr", "div_aclk333", GATE_IP_MFC, 1, 0, 0), | 526 | GATE(smmu_mfcr, "smmu_mfcr", "mout_aclk333_sub", GATE_IP_MFC, 1, 0, 0), |
525 | GATE(smmu_mfcl, "smmu_mfcl", "div_aclk333", GATE_IP_MFC, 2, 0, 0), | 527 | GATE(smmu_mfcl, "smmu_mfcl", "mout_aclk333_sub", GATE_IP_MFC, 2, 0, 0), |
526 | 528 | ||
527 | GATE(rotator, "rotator", "div_aclk266", GATE_IP_GEN, 1, 0, 0), | 529 | GATE(rotator, "rotator", "div_aclk266", GATE_IP_GEN, 1, 0, 0), |
528 | GATE(jpeg, "jpeg", "div_aclk166", GATE_IP_GEN, 2, 0, 0), | 530 | GATE(jpeg, "jpeg", "div_aclk166", GATE_IP_GEN, 2, 0, 0), |