clk: mediatek: Add configurable pcw_chg_reg to mtk_pll_data

In previous MediaTek PLL design, it assumes the pcw change control
is always on the CON1 register.
However, the pcw change bit on MT8183 was moved onto CON0 because
the the PCW length of audio PLLs are extended to 32-bit.
Add configurable pcw_chg_reg to set the pcw change control register
address or using the default control register CON1 if without
setting in pll data.

Signed-off-by: Weiyi Lu <weiyi.lu@mediatek.com>
Reviewed-by: James Liao <jamesjj.liao@mediatek.com>
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
Tested-by: Nicolas Boichat <drinkcat@chromium.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h
index 9d53ee3..33ab173 100644 (file)
--- a/drivers/clk/mediatek/clk-mtk.h
+++ b/drivers/clk/mediatek/clk-mtk.h
@@ -233,6 +233,7 @@ struct mtk_pll_data {
        int pcwibits;
        uint32_t pcw_reg;
        int pcw_shift;
+       uint32_t pcw_chg_reg;
        const struct mtk_pll_div_table *div_table;
        const char *parent_name;
 };

diff --git a/drivers/clk/mediatek/clk-pll.c b/drivers/clk/mediatek/clk-pll.c
index 67aaa30..65cee1d 100644 (file)
--- a/drivers/clk/mediatek/clk-pll.c
+++ b/drivers/clk/mediatek/clk-pll.c
@@ -27,7 +27,7 @@
 #define CON0_BASE_EN           BIT(0)
 #define CON0_PWR_ON            BIT(0)
 #define CON0_ISO_EN            BIT(1)
-#define CON0_PCW_CHG           BIT(31)
+#define PCW_CHG_MASK           BIT(31)
 
 #define AUDPLL_TUNER_EN                BIT(31)
 
@@ -51,6 +51,7 @@ struct mtk_clk_pll {
        void __iomem    *tuner_addr;
        void __iomem    *tuner_en_addr;
        void __iomem    *pcw_addr;
+       void __iomem    *pcw_chg_addr;
        const struct mtk_pll_data *data;
 };
 
@@ -122,7 +123,7 @@ static void __mtk_pll_tuner_disable(struct mtk_clk_pll *pll)
 static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw,
                int postdiv)
 {
-       u32 con1, val;
+       u32 chg, val;
        int pll_en;
 
        pll_en = readl(pll->base_addr + REG_CON0) & CON0_BASE_EN;
@@ -147,14 +148,14 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw,
        val |= pcw << pll->data->pcw_shift;
        writel(val, pll->pcw_addr);
 
-       con1 = readl(pll->base_addr + REG_CON1);
+       chg = readl(pll->pcw_chg_addr);
 
        if (pll_en)
-               con1 |= CON0_PCW_CHG;
+               chg |= PCW_CHG_MASK;
 
-       writel(con1, pll->base_addr + REG_CON1);
+       writel(chg, pll->pcw_chg_addr);
        if (pll->tuner_addr)
-               writel(con1 + 1, pll->tuner_addr);
+               writel(val + 1, pll->tuner_addr);
 
        /* restore tuner_en */
        __mtk_pll_tuner_enable(pll);
@@ -329,6 +330,10 @@ static struct clk *mtk_clk_register_pll(const struct mtk_pll_data *data,
        pll->pwr_addr = base + data->pwr_reg;
        pll->pd_addr = base + data->pd_reg;
        pll->pcw_addr = base + data->pcw_reg;
+       if (data->pcw_chg_reg)
+               pll->pcw_chg_addr = base + data->pcw_chg_reg;
+       else
+               pll->pcw_chg_addr = pll->base_addr + REG_CON1;
        if (data->tuner_reg)
                pll->tuner_addr = base + data->tuner_reg;
        if (data->tuner_en_reg)