target/linux/at91/patches-5.15/105-clk-at91-clk-master-mask-mckr-against-layout-mask.patch

   1 From 27c11c09346b7b9f67eeb39db1b943f4a9742ff3 Mon Sep 17 00:00:00 2001
   2 From: Claudiu Beznea <claudiu.beznea@microchip.com>
   3 Date: Mon, 11 Oct 2021 14:27:13 +0300
   4 Subject: [PATCH 241/247] clk: at91: clk-master: mask mckr against layout->mask
   5
   6 Mask values read/written from/to MCKR against layout->mask as this
   7 mask may be different b/w PMC versions.
   8
   9 Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
  10 Link: https://lore.kernel.org/r/20211011112719.3951784-10-claudiu.beznea@microchip.com
  11 Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
  12 Signed-off-by: Stephen Boyd <sboyd@kernel.org>
  13 ---
  14  drivers/clk/at91/clk-master.c | 7 +++++--
  15  1 file changed, 5 insertions(+), 2 deletions(-)
  16
  17 --- a/drivers/clk/at91/clk-master.c
  18 +++ b/drivers/clk/at91/clk-master.c
  19 @@ -186,8 +186,8 @@ static int clk_master_div_set_rate(struc
  20         if (ret)
  21                 goto unlock;
  22
  23 -       tmp = mckr & master->layout->mask;
  24 -       tmp = (tmp >> MASTER_DIV_SHIFT) & MASTER_DIV_MASK;
  25 +       mckr &= master->layout->mask;
  26 +       tmp = (mckr >> MASTER_DIV_SHIFT) & MASTER_DIV_MASK;
  27         if (tmp == div)
  28                 goto unlock;
  29
  30 @@ -384,6 +384,7 @@ static unsigned long clk_master_pres_rec
  31         regmap_read(master->regmap, master->layout->offset, &val);
  32         spin_unlock_irqrestore(master->lock, flags);
  33
  34 +       val &= master->layout->mask;
  35         pres = (val >> master->layout->pres_shift) & MASTER_PRES_MASK;
  36         if (pres == MASTER_PRES_MAX && characteristics->have_div3_pres)
  37                 pres = 3;
  38 @@ -403,6 +404,8 @@ static u8 clk_master_pres_get_parent(str
  39         regmap_read(master->regmap, master->layout->offset, &mckr);
  40         spin_unlock_irqrestore(master->lock, flags);
  41
  42 +       mckr &= master->layout->mask;
  43 +
  44         return mckr & AT91_PMC_CSS;
  45  }
  46