From: Sasha Levin Date: Mon, 2 Oct 2023 11:02:55 +0000 (-0400) Subject: Fixes for 4.19 X-Git-Tag: v6.5.6~65 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e86ccf08bfcf5193f8f9ff3e30c0f577265a55f4;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.19 Signed-off-by: Sasha Levin --- diff --git a/queue-4.19/arm-dts-ti-omap-motorola-mapphone-fix-abe_clkctrl-wa.patch b/queue-4.19/arm-dts-ti-omap-motorola-mapphone-fix-abe_clkctrl-wa.patch new file mode 100644 index 00000000000..3794e1c8d52 --- /dev/null +++ b/queue-4.19/arm-dts-ti-omap-motorola-mapphone-fix-abe_clkctrl-wa.patch @@ -0,0 +1,56 @@ +From 774ca12199cd57d3912ccd100110d2fdd9ba3a28 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 11 Sep 2023 07:07:38 +0300 +Subject: ARM: dts: ti: omap: motorola-mapphone: Fix abe_clkctrl warning on + boot + +From: Tony Lindgren + +[ Upstream commit ac08bda1569b06b7a62c7b4dd00d4c3b28ceaaec ] + +Commit 0840242e8875 ("ARM: dts: Configure clock parent for pwm vibra") +attempted to fix the PWM settings but ended up causin an additional clock +reparenting error: + +clk: failed to reparent abe-clkctrl:0060:24 to sys_clkin_ck: -22 + +Only timer9 is in the PER domain and can use the sys_clkin_ck clock source. +For timer8, the there is no sys_clkin_ck available as it's in the ABE +domain, instead it should use syc_clk_div_ck. However, for power +management, we want to use the always on sys_32k_ck instead. + +Cc: Ivaylo Dimitrov +Cc: Carl Philipp Klemm +Cc: Merlijn Wajer +Cc: Pavel Machek +Reviewed-by: Sebastian Reichel +Fixes: 0840242e8875 ("ARM: dts: Configure clock parent for pwm vibra") +Depends-on: 61978617e905 ("ARM: dts: Add minimal support for Droid Bionic xt875") +Signed-off-by: Tony Lindgren +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/omap4-droid4-xt894.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts +index 67d77eee9433c..459720f5f5586 100644 +--- a/arch/arm/boot/dts/omap4-droid4-xt894.dts ++++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts +@@ -647,12 +647,12 @@ + /* Configure pwm clock source for timers 8 & 9 */ + &timer8 { + assigned-clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>; +- assigned-clock-parents = <&sys_clkin_ck>; ++ assigned-clock-parents = <&sys_32k_ck>; + }; + + &timer9 { + assigned-clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>; +- assigned-clock-parents = <&sys_clkin_ck>; ++ assigned-clock-parents = <&sys_32k_ck>; + }; + + /* +-- +2.40.1 + diff --git a/queue-4.19/clk-tegra-fix-error-return-case-for-recalc_rate.patch b/queue-4.19/clk-tegra-fix-error-return-case-for-recalc_rate.patch new file mode 100644 index 00000000000..fa4ffb0f8c3 --- /dev/null +++ b/queue-4.19/clk-tegra-fix-error-return-case-for-recalc_rate.patch @@ -0,0 +1,40 @@ +From d9f21e004e47bb03f0731d15ca4dbeec6da7b489 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 12 Sep 2023 14:29:50 +0300 +Subject: clk: tegra: fix error return case for recalc_rate + +From: Timo Alho + +[ Upstream commit a47b44fbb13f5e7a981b4515dcddc93a321ae89c ] + +tegra-bpmp clocks driver makes implicit conversion of signed error +code to unsigned value in recalc_rate operation. The behavior for +recalc_rate, according to it's specification, should be that "If the +driver cannot figure out a rate for this clock, it must return 0." + +Fixes: ca6f2796eef7 ("clk: tegra: Add BPMP clock driver") +Signed-off-by: Timo Alho +Signed-off-by: Mikko Perttunen +Link: https://lore.kernel.org/r/20230912112951.2330497-1-cyndis@kapsi.fi +Signed-off-by: Stephen Boyd +Signed-off-by: Sasha Levin +--- + drivers/clk/tegra/clk-bpmp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/clk/tegra/clk-bpmp.c b/drivers/clk/tegra/clk-bpmp.c +index 01dada561c10c..3bdd3334b0f94 100644 +--- a/drivers/clk/tegra/clk-bpmp.c ++++ b/drivers/clk/tegra/clk-bpmp.c +@@ -162,7 +162,7 @@ static unsigned long tegra_bpmp_clk_recalc_rate(struct clk_hw *hw, + + err = tegra_bpmp_clk_transfer(clk->bpmp, &msg); + if (err < 0) +- return err; ++ return 0; + + return response.rate; + } +-- +2.40.1 + diff --git a/queue-4.19/gpio-pmic-eic-sprd-add-can_sleep-flag-for-pmic-eic-c.patch b/queue-4.19/gpio-pmic-eic-sprd-add-can_sleep-flag-for-pmic-eic-c.patch new file mode 100644 index 00000000000..1e05985874d --- /dev/null +++ b/queue-4.19/gpio-pmic-eic-sprd-add-can_sleep-flag-for-pmic-eic-c.patch @@ -0,0 +1,39 @@ +From 5ceef747d6276c64225e7c8bb7e01a76708f1aff Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 21 Sep 2023 20:25:27 +0800 +Subject: gpio: pmic-eic-sprd: Add can_sleep flag for PMIC EIC chip + +From: Wenhua Lin + +[ Upstream commit 26d9e5640d2130ee16df7b1fb6a908f460ab004c ] + +The drivers uses a mutex and I2C bus access in its PMIC EIC chip +get implementation. This means these functions can sleep and the PMIC EIC +chip should set the can_sleep property to true. + +This will ensure that a warning is printed when trying to get the +value from a context that potentially can't sleep. + +Fixes: 348f3cde84ab ("gpio: Add Spreadtrum PMIC EIC driver support") +Signed-off-by: Wenhua Lin +Signed-off-by: Bartosz Golaszewski +Signed-off-by: Sasha Levin +--- + drivers/gpio/gpio-pmic-eic-sprd.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/gpio/gpio-pmic-eic-sprd.c b/drivers/gpio/gpio-pmic-eic-sprd.c +index 29e044ff4b17d..7697cb96bf36f 100644 +--- a/drivers/gpio/gpio-pmic-eic-sprd.c ++++ b/drivers/gpio/gpio-pmic-eic-sprd.c +@@ -341,6 +341,7 @@ static int sprd_pmic_eic_probe(struct platform_device *pdev) + pmic_eic->chip.set_config = sprd_pmic_eic_set_config; + pmic_eic->chip.set = sprd_pmic_eic_set; + pmic_eic->chip.get = sprd_pmic_eic_get; ++ pmic_eic->chip.can_sleep = true; + + pmic_eic->intc.name = dev_name(&pdev->dev); + pmic_eic->intc.irq_mask = sprd_pmic_eic_irq_mask; +-- +2.40.1 + diff --git a/queue-4.19/series b/queue-4.19/series index aa610b9dd93..ed1f7a8d4d2 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -30,3 +30,6 @@ ext4-replace-the-traditional-ternary-conditional-ope.patch ext4-move-setting-of-trimmed-bit-into-ext4_try_to_tr.patch ext4-do-not-let-fstrim-block-system-suspend.patch mips-alchemy-only-build-mmc-support-helpers-if-au1xm.patch +clk-tegra-fix-error-return-case-for-recalc_rate.patch +arm-dts-ti-omap-motorola-mapphone-fix-abe_clkctrl-wa.patch +gpio-pmic-eic-sprd-add-can_sleep-flag-for-pmic-eic-c.patch