mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 00:11:13 +00:00
de9ad1e704
This is an automatically generated commit which aids following Kernel patch history, as git will see the move and copy as a rename thus defeating the purpose. See: https://lists.openwrt.org/pipermail/openwrt-devel/2023-October/041673.html for the original discussion. Signed-off-by: Nick Hainke <vincent@systemli.org>
47 lines
1.6 KiB
Diff
47 lines
1.6 KiB
Diff
From 27c11c09346b7b9f67eeb39db1b943f4a9742ff3 Mon Sep 17 00:00:00 2001
|
|
From: Claudiu Beznea <claudiu.beznea@microchip.com>
|
|
Date: Mon, 11 Oct 2021 14:27:13 +0300
|
|
Subject: [PATCH 241/247] clk: at91: clk-master: mask mckr against layout->mask
|
|
|
|
Mask values read/written from/to MCKR against layout->mask as this
|
|
mask may be different b/w PMC versions.
|
|
|
|
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
|
|
Link: https://lore.kernel.org/r/20211011112719.3951784-10-claudiu.beznea@microchip.com
|
|
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
|
|
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
|
|
---
|
|
drivers/clk/at91/clk-master.c | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/clk/at91/clk-master.c
|
|
+++ b/drivers/clk/at91/clk-master.c
|
|
@@ -186,8 +186,8 @@ static int clk_master_div_set_rate(struc
|
|
if (ret)
|
|
goto unlock;
|
|
|
|
- tmp = mckr & master->layout->mask;
|
|
- tmp = (tmp >> MASTER_DIV_SHIFT) & MASTER_DIV_MASK;
|
|
+ mckr &= master->layout->mask;
|
|
+ tmp = (mckr >> MASTER_DIV_SHIFT) & MASTER_DIV_MASK;
|
|
if (tmp == div)
|
|
goto unlock;
|
|
|
|
@@ -384,6 +384,7 @@ static unsigned long clk_master_pres_rec
|
|
regmap_read(master->regmap, master->layout->offset, &val);
|
|
spin_unlock_irqrestore(master->lock, flags);
|
|
|
|
+ val &= master->layout->mask;
|
|
pres = (val >> master->layout->pres_shift) & MASTER_PRES_MASK;
|
|
if (pres == MASTER_PRES_MAX && characteristics->have_div3_pres)
|
|
pres = 3;
|
|
@@ -403,6 +404,8 @@ static u8 clk_master_pres_get_parent(str
|
|
regmap_read(master->regmap, master->layout->offset, &mckr);
|
|
spin_unlock_irqrestore(master->lock, flags);
|
|
|
|
+ mckr &= master->layout->mask;
|
|
+
|
|
return mckr & AT91_PMC_CSS;
|
|
}
|
|
|