From: Greg Kroah-Hartman Date: Sun, 9 Feb 2020 21:26:32 +0000 (+0100) Subject: drop broken patch X-Git-Tag: v4.19.103~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c928b818771f749216c2d47f32265546041976c5;p=thirdparty%2Fkernel%2Fstable-queue.git drop broken patch --- diff --git a/queue-4.14/asoc-sgtl5000-fix-vdda-and-vddio-comparison.patch b/queue-4.14/asoc-sgtl5000-fix-vdda-and-vddio-comparison.patch deleted file mode 100644 index 662ad528a7d..00000000000 --- a/queue-4.14/asoc-sgtl5000-fix-vdda-and-vddio-comparison.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e19ecbf105b236a6334fab64d8fd5437b12ee019 Mon Sep 17 00:00:00 2001 -From: Marek Vasut -Date: Fri, 20 Dec 2019 17:44:50 +0100 -Subject: ASoC: sgtl5000: Fix VDDA and VDDIO comparison - -From: Marek Vasut - -commit e19ecbf105b236a6334fab64d8fd5437b12ee019 upstream. - -Comparing the voltage of VDDA and VDDIO to determine whether or not to -enable VDDC manual override is insufficient. This is a problem in case -the VDDA is supplied from different regulator than VDDIO, while both -report the same voltage to the regulator framework. In that case where -VDDA and VDDIO is supplied by different regulators, the VDDC manual -override must not be applied. - -Fixes: b6319b061ba2 ("ASoC: sgtl5000: Fix charge pump source assignment") -Signed-off-by: Marek Vasut -Cc: Fabio Estevam -Cc: Igor Opaniuk -Cc: Marcel Ziswiler -Cc: Mark Brown -Cc: Oleksandr Suvorov -Link: https://lore.kernel.org/r/20191220164450.1395038-2-marex@denx.de -Signed-off-by: Mark Brown -Signed-off-by: Greg Kroah-Hartman - ---- - sound/soc/codecs/sgtl5000.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/sound/soc/codecs/sgtl5000.c -+++ b/sound/soc/codecs/sgtl5000.c -@@ -1262,7 +1262,8 @@ static int sgtl5000_set_power_regs(struc - * if vddio == vdda the source of charge pump should be - * assigned manually to VDDIO - */ -- if (vddio == vdda) { -+ if (regulator_is_equal(sgtl5000->supplies[VDDA].consumer, -+ sgtl5000->supplies[VDDIO].consumer)) { - lreg_ctrl |= SGTL5000_VDDC_ASSN_OVRD; - lreg_ctrl |= SGTL5000_VDDC_MAN_ASSN_VDDIO << - SGTL5000_VDDC_MAN_ASSN_SHIFT; diff --git a/queue-4.14/series b/queue-4.14/series index f5d88e00f73..014198fd9af 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -107,6 +107,5 @@ nfsd-fix-delay-timer-on-32-bit-architectures.patch nfsd-fix-jiffies-time_t-mixup-in-lru-list.patch ubi-fastmap-fix-inverted-logic-in-seen-selfcheck.patch ubi-fix-an-error-pointer-dereference-in-error-handling-code.patch -asoc-sgtl5000-fix-vdda-and-vddio-comparison.patch mfd-da9062-fix-watchdog-compatible-string.patch mfd-rn5t618-mark-adc-control-register-volatile.patch diff --git a/queue-4.19/asoc-sgtl5000-fix-vdda-and-vddio-comparison.patch b/queue-4.19/asoc-sgtl5000-fix-vdda-and-vddio-comparison.patch deleted file mode 100644 index ac322ee07a1..00000000000 --- a/queue-4.19/asoc-sgtl5000-fix-vdda-and-vddio-comparison.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e19ecbf105b236a6334fab64d8fd5437b12ee019 Mon Sep 17 00:00:00 2001 -From: Marek Vasut -Date: Fri, 20 Dec 2019 17:44:50 +0100 -Subject: ASoC: sgtl5000: Fix VDDA and VDDIO comparison - -From: Marek Vasut - -commit e19ecbf105b236a6334fab64d8fd5437b12ee019 upstream. - -Comparing the voltage of VDDA and VDDIO to determine whether or not to -enable VDDC manual override is insufficient. This is a problem in case -the VDDA is supplied from different regulator than VDDIO, while both -report the same voltage to the regulator framework. In that case where -VDDA and VDDIO is supplied by different regulators, the VDDC manual -override must not be applied. - -Fixes: b6319b061ba2 ("ASoC: sgtl5000: Fix charge pump source assignment") -Signed-off-by: Marek Vasut -Cc: Fabio Estevam -Cc: Igor Opaniuk -Cc: Marcel Ziswiler -Cc: Mark Brown -Cc: Oleksandr Suvorov -Link: https://lore.kernel.org/r/20191220164450.1395038-2-marex@denx.de -Signed-off-by: Mark Brown -Signed-off-by: Greg Kroah-Hartman - ---- - sound/soc/codecs/sgtl5000.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/sound/soc/codecs/sgtl5000.c -+++ b/sound/soc/codecs/sgtl5000.c -@@ -1335,7 +1335,8 @@ static int sgtl5000_set_power_regs(struc - * if vddio == vdda the source of charge pump should be - * assigned manually to VDDIO - */ -- if (vddio == vdda) { -+ if (regulator_is_equal(sgtl5000->supplies[VDDA].consumer, -+ sgtl5000->supplies[VDDIO].consumer)) { - lreg_ctrl |= SGTL5000_VDDC_ASSN_OVRD; - lreg_ctrl |= SGTL5000_VDDC_MAN_ASSN_VDDIO << - SGTL5000_VDDC_MAN_ASSN_SHIFT; diff --git a/queue-4.19/series b/queue-4.19/series index 882a7ca3d3d..0bbc1002c64 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -161,6 +161,5 @@ nfsd-fix-jiffies-time_t-mixup-in-lru-list.patch nfsd-return-the-correct-number-of-bytes-written-to-the-file.patch ubi-fastmap-fix-inverted-logic-in-seen-selfcheck.patch ubi-fix-an-error-pointer-dereference-in-error-handling-code.patch -asoc-sgtl5000-fix-vdda-and-vddio-comparison.patch mfd-da9062-fix-watchdog-compatible-string.patch mfd-rn5t618-mark-adc-control-register-volatile.patch diff --git a/queue-4.4/asoc-sgtl5000-fix-vdda-and-vddio-comparison.patch b/queue-4.4/asoc-sgtl5000-fix-vdda-and-vddio-comparison.patch deleted file mode 100644 index 69e8c6636cc..00000000000 --- a/queue-4.4/asoc-sgtl5000-fix-vdda-and-vddio-comparison.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e19ecbf105b236a6334fab64d8fd5437b12ee019 Mon Sep 17 00:00:00 2001 -From: Marek Vasut -Date: Fri, 20 Dec 2019 17:44:50 +0100 -Subject: ASoC: sgtl5000: Fix VDDA and VDDIO comparison - -From: Marek Vasut - -commit e19ecbf105b236a6334fab64d8fd5437b12ee019 upstream. - -Comparing the voltage of VDDA and VDDIO to determine whether or not to -enable VDDC manual override is insufficient. This is a problem in case -the VDDA is supplied from different regulator than VDDIO, while both -report the same voltage to the regulator framework. In that case where -VDDA and VDDIO is supplied by different regulators, the VDDC manual -override must not be applied. - -Fixes: b6319b061ba2 ("ASoC: sgtl5000: Fix charge pump source assignment") -Signed-off-by: Marek Vasut -Cc: Fabio Estevam -Cc: Igor Opaniuk -Cc: Marcel Ziswiler -Cc: Mark Brown -Cc: Oleksandr Suvorov -Link: https://lore.kernel.org/r/20191220164450.1395038-2-marex@denx.de -Signed-off-by: Mark Brown -Signed-off-by: Greg Kroah-Hartman - ---- - sound/soc/codecs/sgtl5000.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/sound/soc/codecs/sgtl5000.c -+++ b/sound/soc/codecs/sgtl5000.c -@@ -1344,7 +1344,8 @@ static int sgtl5000_set_power_regs(struc - * if vddio == vdda the source of charge pump should be - * assigned manually to VDDIO - */ -- if (vddio == vdda) { -+ if (regulator_is_equal(sgtl5000->supplies[VDDA].consumer, -+ sgtl5000->supplies[VDDIO].consumer)) { - lreg_ctrl |= SGTL5000_VDDC_ASSN_OVRD; - lreg_ctrl |= SGTL5000_VDDC_MAN_ASSN_VDDIO << - SGTL5000_VDDC_MAN_ASSN_SHIFT; diff --git a/queue-4.4/series b/queue-4.4/series index 932defe1081..a5058a5508f 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -54,6 +54,5 @@ nfc-pn544-adjust-indentation-in-pn544_hci_check_presence.patch ppp-adjust-indentation-into-ppp_async_input.patch net-smc911x-adjust-indentation-in-smc911x_phy_configure.patch net-tulip-adjust-indentation-in-dmfe-uli526x-_init_module.patch -asoc-sgtl5000-fix-vdda-and-vddio-comparison.patch mfd-da9062-fix-watchdog-compatible-string.patch mfd-rn5t618-mark-adc-control-register-volatile.patch diff --git a/queue-4.9/asoc-sgtl5000-fix-vdda-and-vddio-comparison.patch b/queue-4.9/asoc-sgtl5000-fix-vdda-and-vddio-comparison.patch deleted file mode 100644 index 93a1dd29f3c..00000000000 --- a/queue-4.9/asoc-sgtl5000-fix-vdda-and-vddio-comparison.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e19ecbf105b236a6334fab64d8fd5437b12ee019 Mon Sep 17 00:00:00 2001 -From: Marek Vasut -Date: Fri, 20 Dec 2019 17:44:50 +0100 -Subject: ASoC: sgtl5000: Fix VDDA and VDDIO comparison - -From: Marek Vasut - -commit e19ecbf105b236a6334fab64d8fd5437b12ee019 upstream. - -Comparing the voltage of VDDA and VDDIO to determine whether or not to -enable VDDC manual override is insufficient. This is a problem in case -the VDDA is supplied from different regulator than VDDIO, while both -report the same voltage to the regulator framework. In that case where -VDDA and VDDIO is supplied by different regulators, the VDDC manual -override must not be applied. - -Fixes: b6319b061ba2 ("ASoC: sgtl5000: Fix charge pump source assignment") -Signed-off-by: Marek Vasut -Cc: Fabio Estevam -Cc: Igor Opaniuk -Cc: Marcel Ziswiler -Cc: Mark Brown -Cc: Oleksandr Suvorov -Link: https://lore.kernel.org/r/20191220164450.1395038-2-marex@denx.de -Signed-off-by: Mark Brown -Signed-off-by: Greg Kroah-Hartman - ---- - sound/soc/codecs/sgtl5000.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/sound/soc/codecs/sgtl5000.c -+++ b/sound/soc/codecs/sgtl5000.c -@@ -1165,7 +1165,8 @@ static int sgtl5000_set_power_regs(struc - * if vddio == vdda the source of charge pump should be - * assigned manually to VDDIO - */ -- if (vddio == vdda) { -+ if (regulator_is_equal(sgtl5000->supplies[VDDA].consumer, -+ sgtl5000->supplies[VDDIO].consumer)) { - lreg_ctrl |= SGTL5000_VDDC_ASSN_OVRD; - lreg_ctrl |= SGTL5000_VDDC_MAN_ASSN_VDDIO << - SGTL5000_VDDC_MAN_ASSN_SHIFT; diff --git a/queue-4.9/series b/queue-4.9/series index fde49f5fc49..5b1cf0c78e0 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -69,6 +69,5 @@ nfsd-fix-delay-timer-on-32-bit-architectures.patch nfsd-fix-jiffies-time_t-mixup-in-lru-list.patch ubi-fastmap-fix-inverted-logic-in-seen-selfcheck.patch ubi-fix-an-error-pointer-dereference-in-error-handling-code.patch -asoc-sgtl5000-fix-vdda-and-vddio-comparison.patch mfd-da9062-fix-watchdog-compatible-string.patch mfd-rn5t618-mark-adc-control-register-volatile.patch