From: Sasha Levin Date: Mon, 29 May 2023 02:43:56 +0000 (-0400) Subject: Fixes for 4.14 X-Git-Tag: v4.14.316~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f68998d826147ced8aad87fed905f0c35d20fbd;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.14 Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/asoc-intel-skylake-fix-declaration-of-enum-skl_ch_cf.patch b/queue-4.14/asoc-intel-skylake-fix-declaration-of-enum-skl_ch_cf.patch new file mode 100644 index 00000000000..dfaebc6cbf4 --- /dev/null +++ b/queue-4.14/asoc-intel-skylake-fix-declaration-of-enum-skl_ch_cf.patch @@ -0,0 +1,42 @@ +From ca4eb927c8ef8b18edcdd7fdc82d5e0c046f1d2f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 19 May 2023 22:17:07 +0200 +Subject: ASoC: Intel: Skylake: Fix declaration of enum skl_ch_cfg +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Cezary Rojewski + +[ Upstream commit 95109657471311601b98e71f03d0244f48dc61bb ] + +Constant 'C4_CHANNEL' does not exist on the firmware side. Value 0xC is +reserved for 'C7_1' instead. + +Fixes: 04afbbbb1cba ("ASoC: Intel: Skylake: Update the topology interface structure") +Signed-off-by: Cezary Rojewski +Signed-off-by: Amadeusz Sławiński +Link: https://lore.kernel.org/r/20230519201711.4073845-4-amadeuszx.slawinski@linux.intel.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/intel/skylake/skl-tplg-interface.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/sound/soc/intel/skylake/skl-tplg-interface.h b/sound/soc/intel/skylake/skl-tplg-interface.h +index f8d1749a2e0c8..2fab55e6537c4 100644 +--- a/sound/soc/intel/skylake/skl-tplg-interface.h ++++ b/sound/soc/intel/skylake/skl-tplg-interface.h +@@ -71,7 +71,8 @@ enum skl_ch_cfg { + SKL_CH_CFG_DUAL_MONO = 9, + SKL_CH_CFG_I2S_DUAL_STEREO_0 = 10, + SKL_CH_CFG_I2S_DUAL_STEREO_1 = 11, +- SKL_CH_CFG_4_CHANNEL = 12, ++ SKL_CH_CFG_7_1 = 12, ++ SKL_CH_CFG_4_CHANNEL = SKL_CH_CFG_7_1, + SKL_CH_CFG_INVALID + }; + +-- +2.39.2 + diff --git a/queue-4.14/power-supply-bq27xxx-after-charger-plug-in-out-wait-.patch b/queue-4.14/power-supply-bq27xxx-after-charger-plug-in-out-wait-.patch new file mode 100644 index 00000000000..7f5dc40c4ce --- /dev/null +++ b/queue-4.14/power-supply-bq27xxx-after-charger-plug-in-out-wait-.patch @@ -0,0 +1,41 @@ +From 3f9a270f8d3df89d38e7b3df23defe1f462c53d2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 15 Apr 2023 20:23:38 +0200 +Subject: power: supply: bq27xxx: After charger plug in/out wait 0.5s for + things to stabilize + +From: Hans de Goede + +[ Upstream commit 59a99cd462fbdf71f4e845e09f37783035088b4f ] + +bq27xxx_external_power_changed() gets called when the charger is plugged +in or out. Rather then immediately scheduling an update wait 0.5 seconds +for things to stabilize, so that e.g. the (dis)charge current is stable +when bq27xxx_battery_update() runs. + +Fixes: 740b755a3b34 ("bq27x00: Poll battery state") +Signed-off-by: Hans de Goede +Signed-off-by: Sebastian Reichel +Signed-off-by: Sasha Levin +--- + drivers/power/supply/bq27xxx_battery.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c +index 37b5743ce35e4..49d351027d0e8 100644 +--- a/drivers/power/supply/bq27xxx_battery.c ++++ b/drivers/power/supply/bq27xxx_battery.c +@@ -1817,8 +1817,8 @@ static void bq27xxx_external_power_changed(struct power_supply *psy) + { + struct bq27xxx_device_info *di = power_supply_get_drvdata(psy); + +- cancel_delayed_work_sync(&di->work); +- schedule_delayed_work(&di->work, 0); ++ /* After charger plug in/out wait 0.5s for things to stabilize */ ++ mod_delayed_work(system_wq, &di->work, HZ / 2); + } + + int bq27xxx_battery_setup(struct bq27xxx_device_info *di) +-- +2.39.2 + diff --git a/queue-4.14/series b/queue-4.14/series index 2e3f69635aa..9fc5b67776b 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -84,3 +84,5 @@ xen-pvcalls-back-fix-double-frees-with-pvcalls_new_active_socket.patch x86-show_trace_log_lvl-ensure-stack-pointer-is-aligned-again.patch forcedeth-fix-an-error-handling-path-in-nv_probe.patch 3c589_cs-fix-an-error-handling-path-in-tc589_probe.patch +power-supply-bq27xxx-after-charger-plug-in-out-wait-.patch +asoc-intel-skylake-fix-declaration-of-enum-skl_ch_cf.patch