clk: samsung: exynos7: Correct CMU_FSYS1 clocks names

This patch renames CMU_FSYS1 clocks names to match with user manual.
And also adds missing gate clock for aclk_fsys1_200.

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>

diff --git a/drivers/clk/samsung/clk-exynos7.c b/drivers/clk/samsung/clk-exynos7.c
index ad5aba47dd1962dd9911ba8f5c50be4d62ad3f41..5cc68440e79334a23d3c71522a25d52c88b68146 100644 (file)
--- a/drivers/clk/samsung/clk-exynos7.c
+++ b/drivers/clk/samsung/clk-exynos7.c
@@ -515,6 +515,8 @@ static struct samsung_gate_clock top1_gate_clks[] __initdata = {
 
        GATE(CLK_ACLK_FSYS0_200, "aclk_fsys0_200", "dout_aclk_fsys0_200",
                ENABLE_ACLK_TOP13, 28, CLK_SET_RATE_PARENT, 0),
 
        GATE(CLK_ACLK_FSYS0_200, "aclk_fsys0_200", "dout_aclk_fsys0_200",
                ENABLE_ACLK_TOP13, 28, CLK_SET_RATE_PARENT, 0),

+       GATE(CLK_ACLK_FSYS1_200, "aclk_fsys1_200", "dout_aclk_fsys1_200",
+               ENABLE_ACLK_TOP13, 24, CLK_SET_RATE_PARENT, 0),

 };
 
 static struct samsung_fixed_factor_clock top1_fixed_factor_clks[] __initdata = {
 };
 
 static struct samsung_fixed_factor_clock top1_fixed_factor_clks[] __initdata = {


@@ -957,9 +959,9 @@ CLK_OF_DECLARE(exynos7_clk_fsys0, "samsung,exynos7-clock-fsys0",
 /*
  * List of parent clocks for Muxes in CMU_FSYS1
  */
 /*
  * List of parent clocks for Muxes in CMU_FSYS1
  */

-PNAME(mout_aclk_fsys1_200_p)   = { "fin_pll",  "dout_aclk_fsys1_200" };
-PNAME(mout_sclk_mmc0_p)                = { "fin_pll", "sclk_mmc0" };
-PNAME(mout_sclk_mmc1_p)                = { "fin_pll", "sclk_mmc1" };
+PNAME(mout_aclk_fsys1_200_user_p)      = { "fin_pll", "aclk_fsys1_200" };
+PNAME(mout_sclk_mmc0_user_p)           = { "fin_pll", "sclk_mmc0" };
+PNAME(mout_sclk_mmc1_user_p)           = { "fin_pll", "sclk_mmc1" };

 
 static unsigned long fsys1_clk_regs[] __initdata = {
        MUX_SEL_FSYS10,
 
 static unsigned long fsys1_clk_regs[] __initdata = {
        MUX_SEL_FSYS10,


@@ -968,11 +970,13 @@ static unsigned long fsys1_clk_regs[] __initdata = {
 };
 
 static struct samsung_mux_clock fsys1_mux_clks[] __initdata = {
 };
 
 static struct samsung_mux_clock fsys1_mux_clks[] __initdata = {

-       MUX(0, "mout_aclk_fsys1_200_user", mout_aclk_fsys1_200_p,
+       MUX(0, "mout_aclk_fsys1_200_user", mout_aclk_fsys1_200_user_p,

                MUX_SEL_FSYS10, 28, 1),
 
                MUX_SEL_FSYS10, 28, 1),
 

-       MUX(0, "mout_sclk_mmc1_user", mout_sclk_mmc1_p, MUX_SEL_FSYS11, 24, 1),
-       MUX(0, "mout_sclk_mmc0_user", mout_sclk_mmc0_p, MUX_SEL_FSYS11, 28, 1),
+       MUX(0, "mout_sclk_mmc1_user", mout_sclk_mmc1_user_p,
+               MUX_SEL_FSYS11, 24, 1),
+       MUX(0, "mout_sclk_mmc0_user", mout_sclk_mmc0_user_p,
+               MUX_SEL_FSYS11, 28, 1),

 };
 
 static struct samsung_gate_clock fsys1_gate_clks[] __initdata = {
 };
 
 static struct samsung_gate_clock fsys1_gate_clks[] __initdata = {

diff --git a/include/dt-bindings/clock/exynos7-clk.h b/include/dt-bindings/clock/exynos7-clk.h
index 667faed474ce1e4596115a9560cd97b0828168d0..acdf2e5e1ac081c2263e73fc56ad8a5e1b01acbe 100644 (file)
--- a/include/dt-bindings/clock/exynos7-clk.h
+++ b/include/dt-bindings/clock/exynos7-clk.h
@@ -63,7 +63,8 @@
 #define CLK_SCLK_MMC1                  7
 #define CLK_SCLK_MMC0                  8
 #define CLK_ACLK_FSYS0_200             9
 #define CLK_SCLK_MMC1                  7
 #define CLK_SCLK_MMC0                  8
 #define CLK_ACLK_FSYS0_200             9

-#define TOP1_NR_CLK                    10
+#define CLK_ACLK_FSYS1_200             10
+#define TOP1_NR_CLK                    11

 
 /* CCORE */
 #define PCLK_RTC                       1
 
 /* CCORE */
 #define PCLK_RTC                       1