diff options
author | Alim Akhtar <alim.akhtar@samsung.com> | 2015-09-10 04:44:31 -0400 |
---|---|---|
committer | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2015-09-15 05:16:07 -0400 |
commit | 3f54fb1e09da301173bc44845f93a1be7fe33d8f (patch) | |
tree | 2eabf023ea12e85c2cc419fa91f04f5e0788cf65 /drivers/clk/samsung | |
parent | 56365ee893558a613e2c99e462f29d0047e54b5f (diff) |
clk: samsung: exynos7: Correct CMU_PERIC0 clocks names
This patch renames CMU_PERIC0 clocks names to match with user manual.
And also adds missing gate clock for aclk_peric0_66.
Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Diffstat (limited to 'drivers/clk/samsung')
-rw-r--r-- | drivers/clk/samsung/clk-exynos7.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/clk/samsung/clk-exynos7.c b/drivers/clk/samsung/clk-exynos7.c index 4dedfcf11814..8dfd820ccc8f 100644 --- a/drivers/clk/samsung/clk-exynos7.c +++ b/drivers/clk/samsung/clk-exynos7.c | |||
@@ -224,6 +224,7 @@ CLK_OF_DECLARE(exynos7_clk_topc, "samsung,exynos7-clock-topc", | |||
224 | #define DIV_TOP0_PERIC1 0x0634 | 224 | #define DIV_TOP0_PERIC1 0x0634 |
225 | #define DIV_TOP0_PERIC2 0x0638 | 225 | #define DIV_TOP0_PERIC2 0x0638 |
226 | #define DIV_TOP0_PERIC3 0x063C | 226 | #define DIV_TOP0_PERIC3 0x063C |
227 | #define ENABLE_ACLK_TOP03 0x080C | ||
227 | #define ENABLE_SCLK_TOP0_PERIC0 0x0A30 | 228 | #define ENABLE_SCLK_TOP0_PERIC0 0x0A30 |
228 | #define ENABLE_SCLK_TOP0_PERIC1 0x0A34 | 229 | #define ENABLE_SCLK_TOP0_PERIC1 0x0A34 |
229 | #define ENABLE_SCLK_TOP0_PERIC2 0x0A38 | 230 | #define ENABLE_SCLK_TOP0_PERIC2 0x0A38 |
@@ -338,6 +339,9 @@ static struct samsung_div_clock top0_div_clks[] __initdata = { | |||
338 | }; | 339 | }; |
339 | 340 | ||
340 | static struct samsung_gate_clock top0_gate_clks[] __initdata = { | 341 | static struct samsung_gate_clock top0_gate_clks[] __initdata = { |
342 | GATE(CLK_ACLK_PERIC0_66, "aclk_peric0_66", "dout_aclk_peric0_66", | ||
343 | ENABLE_ACLK_TOP03, 20, CLK_SET_RATE_PARENT, 0), | ||
344 | |||
341 | GATE(CLK_SCLK_SPDIF, "sclk_spdif", "dout_sclk_spdif", | 345 | GATE(CLK_SCLK_SPDIF, "sclk_spdif", "dout_sclk_spdif", |
342 | ENABLE_SCLK_TOP0_PERIC0, 4, CLK_SET_RATE_PARENT, 0), | 346 | ENABLE_SCLK_TOP0_PERIC0, 4, CLK_SET_RATE_PARENT, 0), |
343 | GATE(CLK_SCLK_PCM1, "sclk_pcm1", "dout_sclk_pcm1", | 347 | GATE(CLK_SCLK_PCM1, "sclk_pcm1", "dout_sclk_pcm1", |
@@ -590,8 +594,8 @@ CLK_OF_DECLARE(exynos7_clk_ccore, "samsung,exynos7-clock-ccore", | |||
590 | #define ENABLE_SCLK_PERIC0 0x0A00 | 594 | #define ENABLE_SCLK_PERIC0 0x0A00 |
591 | 595 | ||
592 | /* List of parent clocks for Muxes in CMU_PERIC0 */ | 596 | /* List of parent clocks for Muxes in CMU_PERIC0 */ |
593 | PNAME(mout_aclk_peric0_66_p) = { "fin_pll", "dout_aclk_peric0_66" }; | 597 | PNAME(mout_aclk_peric0_66_user_p) = { "fin_pll", "aclk_peric0_66" }; |
594 | PNAME(mout_sclk_uart0_p) = { "fin_pll", "sclk_uart0" }; | 598 | PNAME(mout_sclk_uart0_user_p) = { "fin_pll", "sclk_uart0" }; |
595 | 599 | ||
596 | static unsigned long peric0_clk_regs[] __initdata = { | 600 | static unsigned long peric0_clk_regs[] __initdata = { |
597 | MUX_SEL_PERIC0, | 601 | MUX_SEL_PERIC0, |
@@ -600,9 +604,9 @@ static unsigned long peric0_clk_regs[] __initdata = { | |||
600 | }; | 604 | }; |
601 | 605 | ||
602 | static struct samsung_mux_clock peric0_mux_clks[] __initdata = { | 606 | static struct samsung_mux_clock peric0_mux_clks[] __initdata = { |
603 | MUX(0, "mout_aclk_peric0_66_user", mout_aclk_peric0_66_p, | 607 | MUX(0, "mout_aclk_peric0_66_user", mout_aclk_peric0_66_user_p, |
604 | MUX_SEL_PERIC0, 0, 1), | 608 | MUX_SEL_PERIC0, 0, 1), |
605 | MUX(0, "mout_sclk_uart0_user", mout_sclk_uart0_p, | 609 | MUX(0, "mout_sclk_uart0_user", mout_sclk_uart0_user_p, |
606 | MUX_SEL_PERIC0, 16, 1), | 610 | MUX_SEL_PERIC0, 16, 1), |
607 | }; | 611 | }; |
608 | 612 | ||