Drop asoc-meson-g12a-add-tohdmitx-reset.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

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 (file)
index b7f41d9..0000000
--- 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 <sashal@kernel.org>
-Date: Fri, 21 Feb 2020 13:11:46 +0100
-Subject: ASoC: meson: g12a: add tohdmitx reset
-
-From: Jerome Brunet <jbrunet@baylibre.com>
-
-[ Upstream commit 22946f37557e27697aabc8e4f62642bfe4a17fd8 ]
-
-Reset the g12a hdmi codec glue on probe. This ensure a sane startup state.
-
-Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
-Link: https://lore.kernel.org/r/20200221121146.1498427-1-jbrunet@baylibre.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 <linux/module.h>
- #include <sound/pcm_params.h>
- #include <linux/regmap.h>
-+#include <linux/reset.h>
- #include <sound/soc.h>
- #include <sound/soc-dai.h>
- 
-@@ -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 3de2447c6a604d7cd8da32ceb1d666fa7bbefab8..bf037866dec2fce83874d6007abf5ec3e3a0fc48 100644 (file)
--- 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 (file)
index 71586e8..0000000
--- 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 <sashal@kernel.org>
-Date: Fri, 21 Feb 2020 13:11:46 +0100
-Subject: ASoC: meson: g12a: add tohdmitx reset
-
-From: Jerome Brunet <jbrunet@baylibre.com>
-
-[ Upstream commit 22946f37557e27697aabc8e4f62642bfe4a17fd8 ]
-
-Reset the g12a hdmi codec glue on probe. This ensure a sane startup state.
-
-Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
-Link: https://lore.kernel.org/r/20200221121146.1498427-1-jbrunet@baylibre.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 <linux/module.h>
- #include <sound/pcm_params.h>
- #include <linux/regmap.h>
-+#include <linux/reset.h>
- #include <sound/soc.h>
- #include <sound/soc-dai.h>
- 
-@@ -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 e532e6dd0f3980dfb5fa8197dd9c3daef03e6e3f..c31e0bba23e57c5b25de744e12152ee8742a4b73 100644 (file)
--- 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