diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-03-02 13:11:44 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-03-05 21:05:45 +0100 |
| commit | 05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5 (patch) | |
| tree | 68e66de94e62af2e06719bd8e6b56f88ce80993a /target/linux/at91/patches-5.10/241-clk-at91-clk-master-mask-mckr-against-layout-mask.patch | |
| parent | ef4bf8b403205062ddb38ebe7b8c4951be346368 (diff) | |
| download | upstream-05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5.tar.gz upstream-05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5.tar.bz2 upstream-05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5.zip | |
kernel: bump 5.10 to 5.10.103
Patches automatically rebased.
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/at91/patches-5.10/241-clk-at91-clk-master-mask-mckr-against-layout-mask.patch')
| -rw-r--r-- | target/linux/at91/patches-5.10/241-clk-at91-clk-master-mask-mckr-against-layout-mask.patch | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/target/linux/at91/patches-5.10/241-clk-at91-clk-master-mask-mckr-against-layout-mask.patch b/target/linux/at91/patches-5.10/241-clk-at91-clk-master-mask-mckr-against-layout-mask.patch index 2f53a44eae..14fa690769 100644 --- a/target/linux/at91/patches-5.10/241-clk-at91-clk-master-mask-mckr-against-layout-mask.patch +++ b/target/linux/at91/patches-5.10/241-clk-at91-clk-master-mask-mckr-against-layout-mask.patch @@ -14,11 +14,9 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org> drivers/clk/at91/clk-master.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -diff --git a/drivers/clk/at91/clk-master.c b/drivers/clk/at91/clk-master.c -index 2093e13b5068..6da9ae34313a 100644 --- 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(struct clk_hw *hw, unsigned long rate, +@@ -186,8 +186,8 @@ static int clk_master_div_set_rate(struc if (ret) goto unlock; @@ -29,7 +27,7 @@ index 2093e13b5068..6da9ae34313a 100644 if (tmp == div) goto unlock; -@@ -384,6 +384,7 @@ static unsigned long clk_master_pres_recalc_rate(struct clk_hw *hw, +@@ -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); @@ -37,7 +35,7 @@ index 2093e13b5068..6da9ae34313a 100644 pres = (val >> master->layout->pres_shift) & MASTER_PRES_MASK; if (pres == 3 && characteristics->have_div3_pres) pres = 3; -@@ -403,6 +404,8 @@ static u8 clk_master_pres_get_parent(struct clk_hw *hw) +@@ -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); @@ -46,6 +44,3 @@ index 2093e13b5068..6da9ae34313a 100644 return mckr & AT91_PMC_CSS; } --- -2.32.0 - |