From: Sasha Levin Date: Sun, 22 Mar 2020 19:38:46 +0000 (-0400) Subject: Drop asoc-meson-g12a-add-tohdmitx-reset.patch X-Git-Tag: v4.19.113~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88f801a408312a4d71957ee7d716f15a8118a799;p=thirdparty%2Fkernel%2Fstable-queue.git Drop asoc-meson-g12a-add-tohdmitx-reset.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.4/asoc-meson-g12a-add-tohdmitx-reset.patch b/queue-5.4/asoc-meson-g12a-add-tohdmitx-reset.patch deleted file mode 100644 index b7f41d90175..00000000000 --- a/queue-5.4/asoc-meson-g12a-add-tohdmitx-reset.patch +++ /dev/null @@ -1,46 +0,0 @@ -From c94a2266db03612e2ff69ac493a220821fbd4c10 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 21 Feb 2020 13:11:46 +0100 -Subject: ASoC: meson: g12a: add tohdmitx reset - -From: Jerome Brunet - -[ Upstream commit 22946f37557e27697aabc8e4f62642bfe4a17fd8 ] - -Reset the g12a hdmi codec glue on probe. This ensure a sane startup state. - -Signed-off-by: Jerome Brunet -Link: https://lore.kernel.org/r/20200221121146.1498427-1-jbrunet@baylibre.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - sound/soc/meson/g12a-tohdmitx.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/sound/soc/meson/g12a-tohdmitx.c b/sound/soc/meson/g12a-tohdmitx.c -index 9cfbd343a00c8..8a0db28a6a406 100644 ---- a/sound/soc/meson/g12a-tohdmitx.c -+++ b/sound/soc/meson/g12a-tohdmitx.c -@@ -8,6 +8,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -378,6 +379,11 @@ static int g12a_tohdmitx_probe(struct platform_device *pdev) - struct device *dev = &pdev->dev; - void __iomem *regs; - struct regmap *map; -+ int ret; -+ -+ ret = device_reset(dev); -+ if (ret) -+ return ret; - - regs = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(regs)) --- -2.20.1 - diff --git a/queue-5.4/series b/queue-5.4/series index 3de2447c6a6..bf037866dec 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -5,7 +5,6 @@ drm-mediatek-find-the-cursor-plane-instead-of-hard-c.patch phy-ti-gmii-sel-fix-set-of-copy-paste-errors.patch phy-ti-gmii-sel-do-not-fail-in-case-of-gmii.patch arm-dts-dra7-l4-mark-timer13-16-as-pwm-capable.patch -asoc-meson-g12a-add-tohdmitx-reset.patch spi-qup-call-spi_qup_pm_resume_runtime-before-suspen.patch powerpc-include-.btf-section.patch cifs-fix-potential-mismatch-of-unc-paths.patch diff --git a/queue-5.5/asoc-meson-g12a-add-tohdmitx-reset.patch b/queue-5.5/asoc-meson-g12a-add-tohdmitx-reset.patch deleted file mode 100644 index 71586e8ba53..00000000000 --- a/queue-5.5/asoc-meson-g12a-add-tohdmitx-reset.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 583656f5f6fda704b97b2e8b2e2fae2571ec015c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 21 Feb 2020 13:11:46 +0100 -Subject: ASoC: meson: g12a: add tohdmitx reset - -From: Jerome Brunet - -[ Upstream commit 22946f37557e27697aabc8e4f62642bfe4a17fd8 ] - -Reset the g12a hdmi codec glue on probe. This ensure a sane startup state. - -Signed-off-by: Jerome Brunet -Link: https://lore.kernel.org/r/20200221121146.1498427-1-jbrunet@baylibre.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - sound/soc/meson/g12a-tohdmitx.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/sound/soc/meson/g12a-tohdmitx.c b/sound/soc/meson/g12a-tohdmitx.c -index 9cfbd343a00c8..8a0db28a6a406 100644 ---- a/sound/soc/meson/g12a-tohdmitx.c -+++ b/sound/soc/meson/g12a-tohdmitx.c -@@ -8,6 +8,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -378,6 +379,11 @@ static int g12a_tohdmitx_probe(struct platform_device *pdev) - struct device *dev = &pdev->dev; - void __iomem *regs; - struct regmap *map; -+ int ret; -+ -+ ret = device_reset(dev); -+ if (ret) -+ return ret; - - regs = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(regs)) --- -2.20.1 - diff --git a/queue-5.5/series b/queue-5.5/series index e532e6dd0f3..c31e0bba23e 100644 --- a/queue-5.5/series +++ b/queue-5.5/series @@ -6,7 +6,6 @@ drm-mediatek-ensure-the-cursor-plane-is-on-top-of-ot.patch phy-ti-gmii-sel-fix-set-of-copy-paste-errors.patch phy-ti-gmii-sel-do-not-fail-in-case-of-gmii.patch arm-dts-dra7-l4-mark-timer13-16-as-pwm-capable.patch -asoc-meson-g12a-add-tohdmitx-reset.patch spi-qup-call-spi_qup_pm_resume_runtime-before-suspen.patch powerpc-include-.btf-section.patch cifs-fix-potential-mismatch-of-unc-paths.patch