7d5f1dbda1
Some patches were part of other linux-mainline kernel versions but are not anymore part of the current 4.19.76. Move 0001-Enable-uart3-for-NanoPi-Neo-Air-used-by-BT.patch in linux-mainline_4.19.76.bbappend to avoid error patching file arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts Hunk #2 FAILED at 162. 1 out of 2 hunks FAILED -- rejects in file arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts Place all patches from Armbian in a separate directory and do all the Balena specific operations in linux-mainline_%.bbappend only. Changelog-entry: Remove unused patches and cleanup Signed-off-by: Vicentiu Galanopulo <vicentiu@balena.io>
30 lines
1 KiB
Diff
30 lines
1 KiB
Diff
diff --git a/drivers/clk/sunxi-ng/ccu_nkmp.c b/drivers/clk/sunxi-ng/ccu_nkmp.c
|
|
index ebd9436d2c7c..9b49adb20d07 100644
|
|
--- a/drivers/clk/sunxi-ng/ccu_nkmp.c
|
|
+++ b/drivers/clk/sunxi-ng/ccu_nkmp.c
|
|
@@ -137,6 +137,13 @@ static long ccu_nkmp_round_rate(struct clk_hw *hw, unsigned long rate,
|
|
if (nkmp->common.features & CCU_FEATURE_FIXED_POSTDIV)
|
|
rate *= nkmp->fixed_post_div;
|
|
|
|
+ if (nkmp->max_rate && rate > nkmp->max_rate) {
|
|
+ rate = nkmp->max_rate;
|
|
+ if (nkmp->common.features & CCU_FEATURE_FIXED_POSTDIV)
|
|
+ rate /= nkmp->fixed_post_div;
|
|
+ return rate;
|
|
+ }
|
|
+
|
|
_nkmp.min_n = nkmp->n.min ?: 1;
|
|
_nkmp.max_n = nkmp->n.max ?: 1 << nkmp->n.width;
|
|
_nkmp.min_k = nkmp->k.min ?: 1;
|
|
diff --git a/drivers/clk/sunxi-ng/ccu_nkmp.h b/drivers/clk/sunxi-ng/ccu_nkmp.h
|
|
index 6940503e7fc4..a9f8c116a745 100644
|
|
--- a/drivers/clk/sunxi-ng/ccu_nkmp.h
|
|
+++ b/drivers/clk/sunxi-ng/ccu_nkmp.h
|
|
@@ -35,6 +35,7 @@ struct ccu_nkmp {
|
|
struct ccu_div_internal p;
|
|
|
|
unsigned int fixed_post_div;
|
|
+ unsigned int max_rate;
|
|
|
|
struct ccu_common common;
|
|
};
|