aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorShaik Ameer Basha <shaik.ameer@samsung.com>2014-05-08 07:28:00 -0400
committerTomasz Figa <t.figa@samsung.com>2014-05-14 13:40:22 -0400
commit1d87db4d4e05f6f0c5343cfcafc4234fe59e3cd1 (patch)
tree362c1823cd1f43ceea034744bc5cb822d2a9abc2 /drivers/clk
parent6b5ae463e472ba2145766066e6e2d465a07074a5 (diff)
clk: samsung: exynos5420: correct sysmmu-mfc parent clocks
This patch corrects the wrong parent-child relationship between sysmmu-mfc clocks. Signed-off-by: Shaik Ameer Basha <shaik.ameer@samsung.com> Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/samsung/clk-exynos5420.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/clk/samsung/clk-exynos5420.c b/drivers/clk/samsung/clk-exynos5420.c
index 980a3f2dd419..e48f6f8e796f 100644
--- a/drivers/clk/samsung/clk-exynos5420.c
+++ b/drivers/clk/samsung/clk-exynos5420.c
@@ -82,6 +82,7 @@
82#define SCLK_DIV_ISP0 0x10580 82#define SCLK_DIV_ISP0 0x10580
83#define SCLK_DIV_ISP1 0x10584 83#define SCLK_DIV_ISP1 0x10584
84#define DIV2_RATIO0 0x10590 84#define DIV2_RATIO0 0x10590
85#define DIV4_RATIO 0x105a0
85#define GATE_BUS_TOP 0x10700 86#define GATE_BUS_TOP 0x10700
86#define GATE_BUS_GEN 0x1073c 87#define GATE_BUS_GEN 0x1073c
87#define GATE_BUS_FSYS0 0x10740 88#define GATE_BUS_FSYS0 0x10740
@@ -176,6 +177,7 @@ static unsigned long exynos5420_clk_regs[] __initdata = {
176 SCLK_DIV_ISP0, 177 SCLK_DIV_ISP0,
177 SCLK_DIV_ISP1, 178 SCLK_DIV_ISP1,
178 DIV2_RATIO0, 179 DIV2_RATIO0,
180 DIV4_RATIO,
179 GATE_BUS_TOP, 181 GATE_BUS_TOP,
180 GATE_BUS_GEN, 182 GATE_BUS_GEN,
181 GATE_BUS_FSYS0, 183 GATE_BUS_FSYS0,
@@ -624,6 +626,9 @@ static struct samsung_div_clock exynos5420_div_clks[] __initdata = {
624 DIV(0, "dout_spi1", "mout_spi1", DIV_PERIC1, 24, 4), 626 DIV(0, "dout_spi1", "mout_spi1", DIV_PERIC1, 24, 4),
625 DIV(0, "dout_spi2", "mout_spi2", DIV_PERIC1, 28, 4), 627 DIV(0, "dout_spi2", "mout_spi2", DIV_PERIC1, 28, 4),
626 628
629 /* Mfc Block */
630 DIV(0, "dout_mfc_blk", "mout_user_aclk333", DIV4_RATIO, 0, 2),
631
627 /* PCM */ 632 /* PCM */
628 DIV(0, "dout_pcm1", "dout_audio1", DIV_PERIC2, 16, 8), 633 DIV(0, "dout_pcm1", "dout_audio1", DIV_PERIC2, 16, 8),
629 DIV(0, "dout_pcm2", "dout_audio2", DIV_PERIC2, 24, 8), 634 DIV(0, "dout_pcm2", "dout_audio2", DIV_PERIC2, 24, 8),
@@ -936,8 +941,8 @@ static struct samsung_gate_clock exynos5420_gate_clks[] __initdata = {
936 GATE_TOP_SCLK_ISP, 12, CLK_SET_RATE_PARENT, 0), 941 GATE_TOP_SCLK_ISP, 12, CLK_SET_RATE_PARENT, 0),
937 942
938 GATE(CLK_MFC, "mfc", "aclk333", GATE_IP_MFC, 0, 0, 0), 943 GATE(CLK_MFC, "mfc", "aclk333", GATE_IP_MFC, 0, 0, 0),
939 GATE(CLK_SMMU_MFCL, "smmu_mfcl", "aclk333", GATE_IP_MFC, 1, 0, 0), 944 GATE(CLK_SMMU_MFCL, "smmu_mfcl", "dout_mfc_blk", GATE_IP_MFC, 1, 0, 0),
940 GATE(CLK_SMMU_MFCR, "smmu_mfcr", "aclk333", GATE_IP_MFC, 2, 0, 0), 945 GATE(CLK_SMMU_MFCR, "smmu_mfcr", "dout_mfc_blk", GATE_IP_MFC, 2, 0, 0),
941 946
942 GATE(CLK_G3D, "g3d", "mout_user_aclk_g3d", GATE_IP_G3D, 9, 0, 0), 947 GATE(CLK_G3D, "g3d", "mout_user_aclk_g3d", GATE_IP_G3D, 9, 0, 0),
943}; 948};