]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
clk: rockchip: Use clock ids for cpu and peri clocks on rk3066
authorPaweł Jarosz <paweljarosz3691@gmail.com>
Fri, 14 Oct 2016 12:16:39 +0000 (14:16 +0200)
committerHeiko Stuebner <heiko@sntech.de>
Fri, 21 Oct 2016 13:27:22 +0000 (15:27 +0200)
Add bindings for ACLK_CPU, HCLK_CPU, PCLK_CPU, ACLK_PERI, HCLK_PERI, PCLK_PERI.

We need this to init it's rate at boot time.

Signed-off-by: Paweł Jarosz <paweljarosz3691@gmail.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
drivers/clk/rockchip/clk-rk3188.c

index d0e722a0e8cff9afb79f7c22535042fe2332ce61..a6d398f4b18f2df6544b241c2d834bdc69805ad1 100644 (file)
@@ -306,14 +306,14 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = {
                        RK2928_CLKSEL_CON(26), 8, 1, MFLAGS, 0, 2, DFLAGS | CLK_DIVIDER_POWER_OF_TWO,
                        RK2928_CLKGATE_CON(0), 2, GFLAGS),
 
-       GATE(0, "aclk_cpu", "aclk_cpu_pre", 0,
+       GATE(ACLK_CPU, "aclk_cpu", "aclk_cpu_pre", 0,
                        RK2928_CLKGATE_CON(0), 3, GFLAGS),
 
        GATE(0, "atclk_cpu", "pclk_cpu_pre", 0,
                        RK2928_CLKGATE_CON(0), 6, GFLAGS),
-       GATE(0, "pclk_cpu", "pclk_cpu_pre", 0,
+       GATE(PCLK_CPU, "pclk_cpu", "pclk_cpu_pre", 0,
                        RK2928_CLKGATE_CON(0), 5, GFLAGS),
-       GATE(0, "hclk_cpu", "hclk_cpu_pre", CLK_IGNORE_UNUSED,
+       GATE(HCLK_CPU, "hclk_cpu", "hclk_cpu_pre", CLK_IGNORE_UNUSED,
                        RK2928_CLKGATE_CON(0), 4, GFLAGS),
 
        COMPOSITE(0, "aclk_lcdc0_pre", mux_pll_src_cpll_gpll_p, CLK_IGNORE_UNUSED,
@@ -323,12 +323,12 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = {
                        RK2928_CLKSEL_CON(31), 15, 1, MFLAGS, 8, 5, DFLAGS,
                        RK2928_CLKGATE_CON(1), 4, GFLAGS),
 
-       GATE(0, "aclk_peri", "aclk_peri_pre", 0,
+       GATE(ACLK_PERI, "aclk_peri", "aclk_peri_pre", 0,
                        RK2928_CLKGATE_CON(2), 1, GFLAGS),
-       COMPOSITE_NOMUX(0, "hclk_peri", "aclk_peri_pre", 0,
+       COMPOSITE_NOMUX(HCLK_PERI, "hclk_peri", "aclk_peri_pre", 0,
                        RK2928_CLKSEL_CON(10), 8, 2, DFLAGS | CLK_DIVIDER_POWER_OF_TWO,
                        RK2928_CLKGATE_CON(2), 2, GFLAGS),
-       COMPOSITE_NOMUX(0, "pclk_peri", "aclk_peri_pre", 0,
+       COMPOSITE_NOMUX(PCLK_PERI, "pclk_peri", "aclk_peri_pre", 0,
                        RK2928_CLKSEL_CON(10), 12, 2, DFLAGS | CLK_DIVIDER_POWER_OF_TWO,
                        RK2928_CLKGATE_CON(2), 3, GFLAGS),