diff options
-rw-r--r-- | drivers/clk/samsung/clk-exynos7.c | 12 | ||||
-rw-r--r-- | include/dt-bindings/clock/exynos7-clk.h | 3 |
2 files changed, 10 insertions, 5 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 | ||
diff --git a/include/dt-bindings/clock/exynos7-clk.h b/include/dt-bindings/clock/exynos7-clk.h index d26fe0f3d5db..256188aa4692 100644 --- a/include/dt-bindings/clock/exynos7-clk.h +++ b/include/dt-bindings/clock/exynos7-clk.h | |||
@@ -49,7 +49,8 @@ | |||
49 | #define CLK_SCLK_SPDIF 12 | 49 | #define CLK_SCLK_SPDIF 12 |
50 | #define CLK_SCLK_PCM1 13 | 50 | #define CLK_SCLK_PCM1 13 |
51 | #define CLK_SCLK_I2S1 14 | 51 | #define CLK_SCLK_I2S1 14 |
52 | #define TOP0_NR_CLK 15 | 52 | #define CLK_ACLK_PERIC0_66 15 |
53 | #define TOP0_NR_CLK 16 | ||
53 | 54 | ||
54 | /* TOP1 */ | 55 | /* TOP1 */ |
55 | #define DOUT_ACLK_FSYS1_200 1 | 56 | #define DOUT_ACLK_FSYS1_200 1 |