241-clk-mediatek-Add-pcw-chg-shift-control.patch 804 B

123456789101112131415161718192021222324
  1. --- a/drivers/clk/mediatek/clk-mtk.h
  2. +++ b/drivers/clk/mediatek/clk-mtk.h
  3. @@ -233,6 +233,7 @@ struct mtk_pll_data {
  4. u32 pcw_reg;
  5. int pcw_shift;
  6. u32 pcw_chg_reg;
  7. + int pcw_chg_shift;
  8. const struct mtk_pll_div_table *div_table;
  9. const char *parent_name;
  10. u32 en_reg;
  11. --- a/drivers/clk/mediatek/clk-pll.c
  12. +++ b/drivers/clk/mediatek/clk-pll.c
  13. @@ -137,7 +137,10 @@ static void mtk_pll_set_rate_regs(struct
  14. pll->data->pcw_shift);
  15. val |= pcw << pll->data->pcw_shift;
  16. writel(val, pll->pcw_addr);
  17. - chg = readl(pll->pcw_chg_addr) | PCW_CHG_MASK;
  18. + if (pll->data->pcw_chg_shift)
  19. + chg = readl(pll->pcw_chg_addr) | BIT(pll->data->pcw_chg_shift);
  20. + else
  21. + chg = readl(pll->pcw_chg_addr) | PCW_CHG_MASK;
  22. writel(chg, pll->pcw_chg_addr);
  23. if (pll->tuner_addr)
  24. writel(val + 1, pll->tuner_addr);