drm/msm/dsi: drop PLL accessor functions
[linux-2.6-microblaze.git] / drivers / gpu / drm / msm / dsi / phy / dsi_phy_28nm.c
index b6b169e..731dc0a 100644 (file)
@@ -86,7 +86,7 @@ static bool pll_28nm_poll_for_ready(struct dsi_pll_28nm *pll_28nm,
        u32 val;
 
        while (nb_tries--) {
-               val = pll_read(pll_28nm->mmio + REG_DSI_28nm_PHY_PLL_STATUS);
+               val = dsi_phy_read(pll_28nm->mmio + REG_DSI_28nm_PHY_PLL_STATUS);
                pll_locked = !!(val & DSI_28nm_PHY_PLL_STATUS_PLL_RDY);
 
                if (pll_locked)
@@ -107,9 +107,9 @@ static void pll_28nm_software_reset(struct dsi_pll_28nm *pll_28nm)
         * Add HW recommended delays after toggling the software
         * reset bit off and back on.
         */
-       pll_write_udelay(base + REG_DSI_28nm_PHY_PLL_TEST_CFG,
+       dsi_phy_write_udelay(base + REG_DSI_28nm_PHY_PLL_TEST_CFG,
                        DSI_28nm_PHY_PLL_TEST_CFG_PLL_SW_RESET, 1);
-       pll_write_udelay(base + REG_DSI_28nm_PHY_PLL_TEST_CFG, 0x00, 1);
+       dsi_phy_write_udelay(base + REG_DSI_28nm_PHY_PLL_TEST_CFG, 0x00, 1);
 }
 
 /*
@@ -131,7 +131,7 @@ static int dsi_pll_28nm_clk_set_rate(struct clk_hw *hw, unsigned long rate,
        VERB("rate=%lu, parent's=%lu", rate, parent_rate);
 
        /* Force postdiv2 to be div-4 */
-       pll_write(base + REG_DSI_28nm_PHY_PLL_POSTDIV2_CFG, 3);
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_POSTDIV2_CFG, 3);
 
        /* Configure the Loop filter resistance */
        for (i = 0; i < LPFR_LUT_SIZE; i++)
@@ -142,11 +142,11 @@ static int dsi_pll_28nm_clk_set_rate(struct clk_hw *hw, unsigned long rate,
                                rate);
                return -EINVAL;
        }
-       pll_write(base + REG_DSI_28nm_PHY_PLL_LPFR_CFG, lpfr_lut[i].resistance);
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_LPFR_CFG, lpfr_lut[i].resistance);
 
        /* Loop filter capacitance values : c1 and c2 */
-       pll_write(base + REG_DSI_28nm_PHY_PLL_LPFC1_CFG, 0x70);
-       pll_write(base + REG_DSI_28nm_PHY_PLL_LPFC2_CFG, 0x15);
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_LPFC1_CFG, 0x70);
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_LPFC2_CFG, 0x15);
 
        rem = rate % VCO_REF_CLK_RATE;
        if (rem) {
@@ -171,7 +171,7 @@ static int dsi_pll_28nm_clk_set_rate(struct clk_hw *hw, unsigned long rate,
 
        DBG("Generated VCO Clock: %lu", gen_vco_clk);
        rem = 0;
-       sdm_cfg1 = pll_read(base + REG_DSI_28nm_PHY_PLL_SDM_CFG1);
+       sdm_cfg1 = dsi_phy_read(base + REG_DSI_28nm_PHY_PLL_SDM_CFG1);
        sdm_cfg1 &= ~DSI_28nm_PHY_PLL_SDM_CFG1_DC_OFFSET__MASK;
        if (frac_n_mode) {
                sdm_cfg0 = 0x0;
@@ -198,17 +198,17 @@ static int dsi_pll_28nm_clk_set_rate(struct clk_hw *hw, unsigned long rate,
        cal_cfg10 = (u32)((gen_vco_clk % (256 * 1000000)) / 1000000);
        DBG("cal_cfg10=%d, cal_cfg11=%d", cal_cfg10, cal_cfg11);
 
-       pll_write(base + REG_DSI_28nm_PHY_PLL_CHGPUMP_CFG, 0x02);
-       pll_write(base + REG_DSI_28nm_PHY_PLL_CAL_CFG3,    0x2b);
-       pll_write(base + REG_DSI_28nm_PHY_PLL_CAL_CFG4,    0x06);
-       pll_write(base + REG_DSI_28nm_PHY_PLL_LKDET_CFG2,  0x0d);
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_CHGPUMP_CFG, 0x02);
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_CAL_CFG3,    0x2b);
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_CAL_CFG4,    0x06);
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_LKDET_CFG2,  0x0d);
 
-       pll_write(base + REG_DSI_28nm_PHY_PLL_SDM_CFG1, sdm_cfg1);
-       pll_write(base + REG_DSI_28nm_PHY_PLL_SDM_CFG2,
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_SDM_CFG1, sdm_cfg1);
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_SDM_CFG2,
                DSI_28nm_PHY_PLL_SDM_CFG2_FREQ_SEED_7_0(sdm_cfg2));
-       pll_write(base + REG_DSI_28nm_PHY_PLL_SDM_CFG3,
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_SDM_CFG3,
                DSI_28nm_PHY_PLL_SDM_CFG3_FREQ_SEED_15_8(sdm_cfg3));
-       pll_write(base + REG_DSI_28nm_PHY_PLL_SDM_CFG4, 0x00);
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_SDM_CFG4, 0x00);
 
        /* Add hardware recommended delay for correct PLL configuration */
        if (pll_28nm->phy->cfg->quirks & DSI_PHY_28NM_QUIRK_PHY_LP)
@@ -216,18 +216,18 @@ static int dsi_pll_28nm_clk_set_rate(struct clk_hw *hw, unsigned long rate,
        else
                udelay(1);
 
-       pll_write(base + REG_DSI_28nm_PHY_PLL_REFCLK_CFG, refclk_cfg);
-       pll_write(base + REG_DSI_28nm_PHY_PLL_PWRGEN_CFG, 0x00);
-       pll_write(base + REG_DSI_28nm_PHY_PLL_VCOLPF_CFG, 0x31);
-       pll_write(base + REG_DSI_28nm_PHY_PLL_SDM_CFG0,   sdm_cfg0);
-       pll_write(base + REG_DSI_28nm_PHY_PLL_CAL_CFG0,   0x12);
-       pll_write(base + REG_DSI_28nm_PHY_PLL_CAL_CFG6,   0x30);
-       pll_write(base + REG_DSI_28nm_PHY_PLL_CAL_CFG7,   0x00);
-       pll_write(base + REG_DSI_28nm_PHY_PLL_CAL_CFG8,   0x60);
-       pll_write(base + REG_DSI_28nm_PHY_PLL_CAL_CFG9,   0x00);
-       pll_write(base + REG_DSI_28nm_PHY_PLL_CAL_CFG10,  cal_cfg10 & 0xff);
-       pll_write(base + REG_DSI_28nm_PHY_PLL_CAL_CFG11,  cal_cfg11 & 0xff);
-       pll_write(base + REG_DSI_28nm_PHY_PLL_EFUSE_CFG,  0x20);
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_REFCLK_CFG, refclk_cfg);
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_PWRGEN_CFG, 0x00);
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_VCOLPF_CFG, 0x31);
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_SDM_CFG0,   sdm_cfg0);
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_CAL_CFG0,   0x12);
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_CAL_CFG6,   0x30);
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_CAL_CFG7,   0x00);
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_CAL_CFG8,   0x60);
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_CAL_CFG9,   0x00);
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_CAL_CFG10,  cal_cfg10 & 0xff);
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_CAL_CFG11,  cal_cfg11 & 0xff);
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_EFUSE_CFG,  0x20);
 
        return 0;
 }
@@ -253,27 +253,27 @@ static unsigned long dsi_pll_28nm_clk_recalc_rate(struct clk_hw *hw,
        VERB("parent_rate=%lu", parent_rate);
 
        /* Check to see if the ref clk doubler is enabled */
-       doubler = pll_read(base + REG_DSI_28nm_PHY_PLL_REFCLK_CFG) &
+       doubler = dsi_phy_read(base + REG_DSI_28nm_PHY_PLL_REFCLK_CFG) &
                        DSI_28nm_PHY_PLL_REFCLK_CFG_DBLR;
        ref_clk += (doubler * VCO_REF_CLK_RATE);
 
        /* see if it is integer mode or sdm mode */
-       sdm0 = pll_read(base + REG_DSI_28nm_PHY_PLL_SDM_CFG0);
+       sdm0 = dsi_phy_read(base + REG_DSI_28nm_PHY_PLL_SDM_CFG0);
        if (sdm0 & DSI_28nm_PHY_PLL_SDM_CFG0_BYP) {
                /* integer mode */
                sdm_byp_div = FIELD(
-                               pll_read(base + REG_DSI_28nm_PHY_PLL_SDM_CFG0),
+                               dsi_phy_read(base + REG_DSI_28nm_PHY_PLL_SDM_CFG0),
                                DSI_28nm_PHY_PLL_SDM_CFG0_BYP_DIV) + 1;
                vco_rate = ref_clk * sdm_byp_div;
        } else {
                /* sdm mode */
                sdm_dc_off = FIELD(
-                               pll_read(base + REG_DSI_28nm_PHY_PLL_SDM_CFG1),
+                               dsi_phy_read(base + REG_DSI_28nm_PHY_PLL_SDM_CFG1),
                                DSI_28nm_PHY_PLL_SDM_CFG1_DC_OFFSET);
                DBG("sdm_dc_off = %d", sdm_dc_off);
-               sdm2 = FIELD(pll_read(base + REG_DSI_28nm_PHY_PLL_SDM_CFG2),
+               sdm2 = FIELD(dsi_phy_read(base + REG_DSI_28nm_PHY_PLL_SDM_CFG2),
                                DSI_28nm_PHY_PLL_SDM_CFG2_FREQ_SEED_7_0);
-               sdm3 = FIELD(pll_read(base + REG_DSI_28nm_PHY_PLL_SDM_CFG3),
+               sdm3 = FIELD(dsi_phy_read(base + REG_DSI_28nm_PHY_PLL_SDM_CFG3),
                                DSI_28nm_PHY_PLL_SDM_CFG3_FREQ_SEED_15_8);
                sdm_freq_seed = (sdm3 << 8) | sdm2;
                DBG("sdm_freq_seed = %d", sdm_freq_seed);
@@ -306,22 +306,22 @@ static int _dsi_pll_28nm_vco_prepare_hpm(struct dsi_pll_28nm *pll_28nm)
         * Add necessary delays recommended by hardware.
         */
        val = DSI_28nm_PHY_PLL_GLB_CFG_PLL_PWRDN_B;
-       pll_write_udelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 1);
+       dsi_phy_write_udelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 1);
 
        val |= DSI_28nm_PHY_PLL_GLB_CFG_PLL_PWRGEN_PWRDN_B;
-       pll_write_udelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 200);
+       dsi_phy_write_udelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 200);
 
        val |= DSI_28nm_PHY_PLL_GLB_CFG_PLL_LDO_PWRDN_B;
-       pll_write_udelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 500);
+       dsi_phy_write_udelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 500);
 
        val |= DSI_28nm_PHY_PLL_GLB_CFG_PLL_ENABLE;
-       pll_write_udelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 600);
+       dsi_phy_write_udelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 600);
 
        for (i = 0; i < 2; i++) {
                /* DSI Uniphy lock detect setting */
-               pll_write_udelay(base + REG_DSI_28nm_PHY_PLL_LKDET_CFG2,
+               dsi_phy_write_udelay(base + REG_DSI_28nm_PHY_PLL_LKDET_CFG2,
                                0x0c, 100);
-               pll_write(base + REG_DSI_28nm_PHY_PLL_LKDET_CFG2, 0x0d);
+               dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_LKDET_CFG2, 0x0d);
 
                /* poll for PLL ready status */
                locked = pll_28nm_poll_for_ready(pll_28nm,
@@ -336,22 +336,22 @@ static int _dsi_pll_28nm_vco_prepare_hpm(struct dsi_pll_28nm *pll_28nm)
                 * Add necessary delays recommended by hardware.
                 */
                val = DSI_28nm_PHY_PLL_GLB_CFG_PLL_PWRDN_B;
-               pll_write_udelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 1);
+               dsi_phy_write_udelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 1);
 
                val |= DSI_28nm_PHY_PLL_GLB_CFG_PLL_PWRGEN_PWRDN_B;
-               pll_write_udelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 200);
+               dsi_phy_write_udelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 200);
 
                val |= DSI_28nm_PHY_PLL_GLB_CFG_PLL_LDO_PWRDN_B;
-               pll_write_udelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 250);
+               dsi_phy_write_udelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 250);
 
                val &= ~DSI_28nm_PHY_PLL_GLB_CFG_PLL_LDO_PWRDN_B;
-               pll_write_udelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 200);
+               dsi_phy_write_udelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 200);
 
                val |= DSI_28nm_PHY_PLL_GLB_CFG_PLL_LDO_PWRDN_B;
-               pll_write_udelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 500);
+               dsi_phy_write_udelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 500);
 
                val |= DSI_28nm_PHY_PLL_GLB_CFG_PLL_ENABLE;
-               pll_write_udelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 600);
+               dsi_phy_write_udelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 600);
        }
 
        if (unlikely(!locked))
@@ -401,21 +401,21 @@ static int dsi_pll_28nm_vco_prepare_lp(struct clk_hw *hw)
         * PLL power up sequence.
         * Add necessary delays recommended by hardware.
         */
-       pll_write_ndelay(base + REG_DSI_28nm_PHY_PLL_CAL_CFG1, 0x34, 500);
+       dsi_phy_write_ndelay(base + REG_DSI_28nm_PHY_PLL_CAL_CFG1, 0x34, 500);
 
        val = DSI_28nm_PHY_PLL_GLB_CFG_PLL_PWRDN_B;
-       pll_write_ndelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 500);
+       dsi_phy_write_ndelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 500);
 
        val |= DSI_28nm_PHY_PLL_GLB_CFG_PLL_PWRGEN_PWRDN_B;
-       pll_write_ndelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 500);
+       dsi_phy_write_ndelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 500);
 
        val |= DSI_28nm_PHY_PLL_GLB_CFG_PLL_LDO_PWRDN_B |
                DSI_28nm_PHY_PLL_GLB_CFG_PLL_ENABLE;
-       pll_write_ndelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 500);
+       dsi_phy_write_ndelay(base + REG_DSI_28nm_PHY_PLL_GLB_CFG, val, 500);
 
        /* DSI PLL toggle lock detect setting */
-       pll_write_ndelay(base + REG_DSI_28nm_PHY_PLL_LKDET_CFG2, 0x04, 500);
-       pll_write_udelay(base + REG_DSI_28nm_PHY_PLL_LKDET_CFG2, 0x05, 512);
+       dsi_phy_write_ndelay(base + REG_DSI_28nm_PHY_PLL_LKDET_CFG2, 0x04, 500);
+       dsi_phy_write_udelay(base + REG_DSI_28nm_PHY_PLL_LKDET_CFG2, 0x05, 512);
 
        locked = pll_28nm_poll_for_ready(pll_28nm, max_reads, timeout_us);
 
@@ -439,7 +439,7 @@ static void dsi_pll_28nm_vco_unprepare(struct clk_hw *hw)
        if (unlikely(!pll_28nm->phy->pll_on))
                return;
 
-       pll_write(pll_28nm->mmio + REG_DSI_28nm_PHY_PLL_GLB_CFG, 0x00);
+       dsi_phy_write(pll_28nm->mmio + REG_DSI_28nm_PHY_PLL_GLB_CFG, 0x00);
 
        pll_28nm->phy->pll_on = false;
 }
@@ -486,10 +486,10 @@ static void dsi_28nm_pll_save_state(struct msm_dsi_phy *phy)
        void __iomem *base = pll_28nm->mmio;
 
        cached_state->postdiv3 =
-                       pll_read(base + REG_DSI_28nm_PHY_PLL_POSTDIV3_CFG);
+                       dsi_phy_read(base + REG_DSI_28nm_PHY_PLL_POSTDIV3_CFG);
        cached_state->postdiv1 =
-                       pll_read(base + REG_DSI_28nm_PHY_PLL_POSTDIV1_CFG);
-       cached_state->byte_mux = pll_read(base + REG_DSI_28nm_PHY_PLL_VREG_CFG);
+                       dsi_phy_read(base + REG_DSI_28nm_PHY_PLL_POSTDIV1_CFG);
+       cached_state->byte_mux = dsi_phy_read(base + REG_DSI_28nm_PHY_PLL_VREG_CFG);
        if (dsi_pll_28nm_clk_is_enabled(phy->vco_hw))
                cached_state->vco_rate = clk_hw_get_rate(phy->vco_hw);
        else
@@ -511,11 +511,11 @@ static int dsi_28nm_pll_restore_state(struct msm_dsi_phy *phy)
                return ret;
        }
 
-       pll_write(base + REG_DSI_28nm_PHY_PLL_POSTDIV3_CFG,
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_POSTDIV3_CFG,
                        cached_state->postdiv3);
-       pll_write(base + REG_DSI_28nm_PHY_PLL_POSTDIV1_CFG,
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_POSTDIV1_CFG,
                        cached_state->postdiv1);
-       pll_write(base + REG_DSI_28nm_PHY_PLL_VREG_CFG,
+       dsi_phy_write(base + REG_DSI_28nm_PHY_PLL_VREG_CFG,
                        cached_state->byte_mux);
 
        return 0;