aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/clk/samsung/clk-exynos5420.c12
-rw-r--r--include/dt-bindings/clock/exynos5420.h2
2 files changed, 13 insertions, 1 deletions
diff --git a/drivers/clk/samsung/clk-exynos5420.c b/drivers/clk/samsung/clk-exynos5420.c
index 2171366237af..9ff36140bcdf 100644
--- a/drivers/clk/samsung/clk-exynos5420.c
+++ b/drivers/clk/samsung/clk-exynos5420.c
@@ -62,7 +62,9 @@
62#define SRC_TOP11 0x10284 62#define SRC_TOP11 0x10284
63#define SRC_TOP12 0x10288 63#define SRC_TOP12 0x10288
64#define SRC_MASK_TOP2 0x10308 64#define SRC_MASK_TOP2 0x10308
65#define SRC_MASK_TOP7 0x1031c
65#define SRC_MASK_DISP10 0x1032c 66#define SRC_MASK_DISP10 0x1032c
67#define SRC_MASK_MAU 0x10334
66#define SRC_MASK_FSYS 0x10340 68#define SRC_MASK_FSYS 0x10340
67#define SRC_MASK_PERIC0 0x10350 69#define SRC_MASK_PERIC0 0x10350
68#define SRC_MASK_PERIC1 0x10354 70#define SRC_MASK_PERIC1 0x10354
@@ -155,6 +157,7 @@ static unsigned long exynos5420_clk_regs[] __initdata = {
155 SRC_TOP11, 157 SRC_TOP11,
156 SRC_TOP12, 158 SRC_TOP12,
157 SRC_MASK_TOP2, 159 SRC_MASK_TOP2,
160 SRC_MASK_TOP7,
158 SRC_MASK_DISP10, 161 SRC_MASK_DISP10,
159 SRC_MASK_FSYS, 162 SRC_MASK_FSYS,
160 SRC_MASK_PERIC0, 163 SRC_MASK_PERIC0,
@@ -351,6 +354,8 @@ PNAME(mout_hdmi_p) = {"dout_hdmi_pixel", "sclk_hdmiphy"};
351PNAME(mout_maudio0_p) = {"fin_pll", "maudio_clk", "mout_sclk_dpll", 354PNAME(mout_maudio0_p) = {"fin_pll", "maudio_clk", "mout_sclk_dpll",
352 "mout_sclk_mpll", "mout_sclk_spll", "mout_sclk_ipll", 355 "mout_sclk_mpll", "mout_sclk_spll", "mout_sclk_ipll",
353 "mout_sclk_epll", "mout_sclk_rpll"}; 356 "mout_sclk_epll", "mout_sclk_rpll"};
357PNAME(mout_mau_epll_clk_p) = {"mout_sclk_epll", "mout_sclk_dpll",
358 "mout_sclk_mpll", "mout_sclk_spll"};
354 359
355/* fixed rate clocks generated outside the soc */ 360/* fixed rate clocks generated outside the soc */
356static struct samsung_fixed_rate_clock exynos5420_fixed_rate_ext_clks[] __initdata = { 361static struct samsung_fixed_rate_clock exynos5420_fixed_rate_ext_clks[] __initdata = {
@@ -373,6 +378,8 @@ static struct samsung_fixed_factor_clock exynos5420_fixed_factor_clks[] __initda
373static struct samsung_mux_clock exynos5420_mux_clks[] __initdata = { 378static struct samsung_mux_clock exynos5420_mux_clks[] __initdata = {
374 MUX(0, "mout_mspll_kfc", mout_mspll_cpu_p, SRC_TOP7, 8, 2), 379 MUX(0, "mout_mspll_kfc", mout_mspll_cpu_p, SRC_TOP7, 8, 2),
375 MUX(0, "mout_mspll_cpu", mout_mspll_cpu_p, SRC_TOP7, 12, 2), 380 MUX(0, "mout_mspll_cpu", mout_mspll_cpu_p, SRC_TOP7, 12, 2),
381 MUX(0, "mout_mau_epll_clk", mout_mau_epll_clk_p, SRC_TOP7, 20, 2),
382
376 MUX(0, "mout_apll", mout_apll_p, SRC_CPU, 0, 1), 383 MUX(0, "mout_apll", mout_apll_p, SRC_CPU, 0, 1),
377 MUX(0, "mout_cpu", mout_cpu_p, SRC_CPU, 16, 1), 384 MUX(0, "mout_cpu", mout_cpu_p, SRC_CPU, 16, 1),
378 MUX(0, "mout_kpll", mout_kpll_p, SRC_KFC, 0, 1), 385 MUX(0, "mout_kpll", mout_kpll_p, SRC_KFC, 0, 1),
@@ -518,7 +525,7 @@ static struct samsung_mux_clock exynos5420_mux_clks[] __initdata = {
518 MUX(0, "mout_fimd1_final", mout_fimd1_final_p, TOP_SPARE2, 8, 1), 525 MUX(0, "mout_fimd1_final", mout_fimd1_final_p, TOP_SPARE2, 8, 1),
519 526
520 /* MAU Block */ 527 /* MAU Block */
521 MUX(0, "mout_maudio0", mout_maudio0_p, SRC_MAU, 28, 3), 528 MUX(CLK_MOUT_MAUDIO0, "mout_maudio0", mout_maudio0_p, SRC_MAU, 28, 3),
522 529
523 /* FSYS Block */ 530 /* FSYS Block */
524 MUX(0, "mout_usbd301", mout_group2_p, SRC_FSYS, 4, 3), 531 MUX(0, "mout_usbd301", mout_group2_p, SRC_FSYS, 4, 3),
@@ -718,6 +725,9 @@ static struct samsung_gate_clock exynos5420_gate_clks[] __initdata = {
718 GATE(0, "aclk300_disp1", "mout_user_aclk300_disp1", 725 GATE(0, "aclk300_disp1", "mout_user_aclk300_disp1",
719 SRC_MASK_TOP2, 24, 0, 0), 726 SRC_MASK_TOP2, 24, 0, 0),
720 727
728 GATE(CLK_MAU_EPLL, "mau_epll", "mout_mau_epll_clk",
729 SRC_MASK_TOP7, 20, 0, 0),
730
721 /* sclk */ 731 /* sclk */
722 GATE(CLK_SCLK_UART0, "sclk_uart0", "dout_uart0", 732 GATE(CLK_SCLK_UART0, "sclk_uart0", "dout_uart0",
723 GATE_TOP_SCLK_PERIC, 0, CLK_SET_RATE_PARENT, 0), 733 GATE_TOP_SCLK_PERIC, 0, CLK_SET_RATE_PARENT, 0),
diff --git a/include/dt-bindings/clock/exynos5420.h b/include/dt-bindings/clock/exynos5420.h
index 16262da05cf2..128fb97d175c 100644
--- a/include/dt-bindings/clock/exynos5420.h
+++ b/include/dt-bindings/clock/exynos5420.h
@@ -58,6 +58,7 @@
58#define CLK_SCLK_GSCL_WA 156 58#define CLK_SCLK_GSCL_WA 156
59#define CLK_SCLK_GSCL_WB 157 59#define CLK_SCLK_GSCL_WB 157
60#define CLK_SCLK_HDMIPHY 158 60#define CLK_SCLK_HDMIPHY 158
61#define CLK_MAU_EPLL 159
61 62
62/* gate clocks */ 63/* gate clocks */
63#define CLK_ACLK66_PERIC 256 64#define CLK_ACLK66_PERIC 256
@@ -195,6 +196,7 @@
195#define CLK_MOUT_HDMI 640 196#define CLK_MOUT_HDMI 640
196#define CLK_MOUT_G3D 641 197#define CLK_MOUT_G3D 641
197#define CLK_MOUT_VPLL 642 198#define CLK_MOUT_VPLL 642
199#define CLK_MOUT_MAUDIO0 643
198 200
199/* divider clocks */ 201/* divider clocks */
200#define CLK_DOUT_PIXEL 768 202#define CLK_DOUT_PIXEL 768