clk: mmp: frac: Allow setting bits other than the numerator/denominator

For the I2S fractional clocks, there are more bits that need to be set
for the clock to run. Their actual meaning is unknown.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Link: https://lkml.kernel.org/r/20200519224151.2074597-3-lkundrak@v3.sk
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/mmp/clk-frac.c b/drivers/clk/mmp/clk-frac.c
index ed9928f5bdc7f6408bdc25ee13412c7c0d548c3e..48f592bd633dfa150072654bcb76480580609882 100644 (file)
--- a/drivers/clk/mmp/clk-frac.c
+++ b/drivers/clk/mmp/clk-frac.c
@@ -148,7 +148,10 @@ static int clk_factor_init(struct clk_hw *hw)
                val &= ~(masks->den_mask << masks->den_shift);
                val |= (factor->ftbl[0].den & masks->den_mask) <<
                        masks->den_shift;
+       }
 
+       if (!(val & masks->enable_mask) || i >= factor->ftbl_cnt) {
+               val |= masks->enable_mask;
                writel(val, factor->base);
        }
 

diff --git a/drivers/clk/mmp/clk.h b/drivers/clk/mmp/clk.h
index 971b4d6d992fb774e4730e343aca7d34739c997a..0efd5b0b2f01bb13563cb9baabdcc335cc65dbe6 100644 (file)
--- a/drivers/clk/mmp/clk.h
+++ b/drivers/clk/mmp/clk.h
@@ -16,6 +16,7 @@ struct mmp_clk_factor_masks {
        unsigned int den_mask;
        unsigned int num_shift;
        unsigned int den_shift;
+       unsigned int enable_mask;
 };
 
 struct mmp_clk_factor_tbl {