rockchip: Rename the CRU_MODE_CON fields

These should match the datasheet naming. Adjust them.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3288.h b/arch/arm/include/asm/arch-rockchip/cru_rk3288.h
index 7ebcc405e76c2d4580a161c613d629ca1f7d553d..b0dea7060a73b9863f1681fadf056f1198777dc5 100644 (file)
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3288.h
@@ -131,35 +131,35 @@ enum {
 
 /* CRU_MODE_CON */
 enum {
-       NPLL_WORK_SHIFT         = 0xe,
-       NPLL_WORK_MASK          = 3,
-       NPLL_WORK_SLOW          = 0,
-       NPLL_WORK_NORMAL,
-       NPLL_WORK_DEEP,
-
-       GPLL_WORK_SHIFT         = 0xc,
-       GPLL_WORK_MASK          = 3,
-       GPLL_WORK_SLOW          = 0,
-       GPLL_WORK_NORMAL,
-       GPLL_WORK_DEEP,
-
-       CPLL_WORK_SHIFT         = 8,
-       CPLL_WORK_MASK          = 3,
-       CPLL_WORK_SLOW          = 0,
-       CPLL_WORK_NORMAL,
-       CPLL_WORK_DEEP,
-
-       DPLL_WORK_SHIFT         = 4,
-       DPLL_WORK_MASK          = 3,
-       DPLL_WORK_SLOW          = 0,
-       DPLL_WORK_NORMAL,
-       DPLL_WORK_DEEP,
-
-       APLL_WORK_SHIFT         = 0,
-       APLL_WORK_MASK          = 3,
-       APLL_WORK_SLOW          = 0,
-       APLL_WORK_NORMAL,
-       APLL_WORK_DEEP,
+       NPLL_MODE_SHIFT         = 0xe,
+       NPLL_MODE_MASK          = 3,
+       NPLL_MODE_SLOW          = 0,
+       NPLL_MODE_NORMAL,
+       NPLL_MODE_DEEP,
+
+       GPLL_MODE_SHIFT         = 0xc,
+       GPLL_MODE_MASK          = 3,
+       GPLL_MODE_SLOW          = 0,
+       GPLL_MODE_NORMAL,
+       GPLL_MODE_DEEP,
+
+       CPLL_MODE_SHIFT         = 8,
+       CPLL_MODE_MASK          = 3,
+       CPLL_MODE_SLOW          = 0,
+       CPLL_MODE_NORMAL,
+       CPLL_MODE_DEEP,
+
+       DPLL_MODE_SHIFT         = 4,
+       DPLL_MODE_MASK          = 3,
+       DPLL_MODE_SLOW          = 0,
+       DPLL_MODE_NORMAL,
+       DPLL_MODE_DEEP,
+
+       APLL_MODE_SHIFT         = 0,
+       APLL_MODE_MASK          = 3,
+       APLL_MODE_SLOW          = 0,
+       APLL_MODE_NORMAL,
+       APLL_MODE_DEEP,
 };
 
 /* CRU_APLL_CON0 */

diff --git a/drivers/clk/clk_rk3288.c b/drivers/clk/clk_rk3288.c
index 5a8f175e4b062d33811011fb98c9f913361fe4b6..ed39b934b1012b352c9ddcaebfc405e05a362283 100644 (file)
--- a/drivers/clk/clk_rk3288.c
+++ b/drivers/clk/clk_rk3288.c
@@ -97,27 +97,6 @@ enum {
        PERI_ACLK_DIV_SHIFT     = 0,
        PERI_ACLK_DIV_MASK      = 0x1f,
 
-       /* CLKSEL37 */
-       DPLL_MODE_MASK          = 0x3,
-       DPLL_MODE_SHIFT         = 4,
-       DPLL_MODE_SLOW          = 0,
-       DPLL_MODE_NORM,
-
-       CPLL_MODE_MASK          = 3,
-       CPLL_MODE_SHIFT         = 8,
-       CPLL_MODE_SLOW          = 0,
-       CPLL_MODE_NORM,
-
-       GPLL_MODE_MASK          = 3,
-       GPLL_MODE_SHIFT         = 12,
-       GPLL_MODE_SLOW          = 0,
-       GPLL_MODE_NORM,
-
-       NPLL_MODE_MASK          = 3,
-       NPLL_MODE_SHIFT         = 14,
-       NPLL_MODE_SLOW          = 0,
-       NPLL_MODE_NORM,
-
        SOCSTS_DPLL_LOCK        = 1 << 5,
        SOCSTS_APLL_LOCK        = 1 << 6,
        SOCSTS_CPLL_LOCK        = 1 << 7,
@@ -251,7 +230,7 @@ static int rkclk_configure_ddr(struct rk3288_cru *cru, struct rk3288_grf *grf,
 
        /* PLL enter normal-mode */
        rk_clrsetreg(&cru->cru_mode_con, DPLL_MODE_MASK << DPLL_MODE_SHIFT,
-                    DPLL_MODE_NORM << DPLL_MODE_SHIFT);
+                    DPLL_MODE_NORMAL << DPLL_MODE_SHIFT);
 
        return 0;
 }
@@ -331,8 +310,8 @@ static void rkclk_init(struct rk3288_cru *cru, struct rk3288_grf *grf)
        rk_clrsetreg(&cru->cru_mode_con,
                     GPLL_MODE_MASK << GPLL_MODE_SHIFT |
                     CPLL_MODE_MASK << CPLL_MODE_SHIFT,
-                    GPLL_MODE_NORM << GPLL_MODE_SHIFT |
-                    GPLL_MODE_NORM << CPLL_MODE_SHIFT);
+                    GPLL_MODE_NORMAL << GPLL_MODE_SHIFT |
+                    CPLL_MODE_NORMAL << CPLL_MODE_SHIFT);
 }
 #endif
 
@@ -345,17 +324,17 @@ static uint32_t rkclk_pll_get_rate(struct rk3288_cru *cru,
        int pll_id = rk_pll_id(clk_id);
        struct rk3288_pll *pll = &cru->pll[pll_id];
        static u8 clk_shift[CLK_COUNT] = {
-               0xff, APLL_WORK_SHIFT, DPLL_WORK_SHIFT, CPLL_WORK_SHIFT,
-               GPLL_WORK_SHIFT, NPLL_WORK_SHIFT
+               0xff, APLL_MODE_SHIFT, DPLL_MODE_SHIFT, CPLL_MODE_SHIFT,
+               GPLL_MODE_SHIFT, NPLL_MODE_SHIFT
        };
        uint shift;
 
        con = readl(&cru->cru_mode_con);
        shift = clk_shift[clk_id];
-       switch ((con >> shift) & APLL_WORK_MASK) {
-       case APLL_WORK_SLOW:
+       switch ((con >> shift) & APLL_MODE_MASK) {
+       case APLL_MODE_SLOW:
                return OSC_HZ;
-       case APLL_WORK_NORMAL:
+       case APLL_MODE_NORMAL:
                /* normal mode */
                con = readl(&pll->con0);
                no = ((con >> CLKOD_SHIFT) & CLKOD_MASK) + 1;
@@ -364,7 +343,7 @@ static uint32_t rkclk_pll_get_rate(struct rk3288_cru *cru,
                nf = ((con >> CLKF_SHIFT) & CLKF_MASK) + 1;
 
                return (24 * nf / (nr * no)) * 1000000;
-       case APLL_WORK_DEEP:
+       case APLL_MODE_DEEP:
        default:
                return 32768;
        }