drop asoc-codec-hdac_hdmi-add-device_link-to-card-device.patch from 4.9 and 4.14

diff --git a/queue-4.14/asoc-codec-hdac_hdmi-add-device_link-to-card-device.patch b/queue-4.14/asoc-codec-hdac_hdmi-add-device_link-to-card-device.patch
deleted file mode 100644 (file)
index fd4bc05..0000000
--- a/queue-4.14/asoc-codec-hdac_hdmi-add-device_link-to-card-device.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 01c8327667c249818d3712c3e25c7ad2aca7f389 Mon Sep 17 00:00:00 2001
-From: Libin Yang <libin.yang@intel.com>
-Date: Sat, 13 Apr 2019 21:18:12 +0800
-Subject: ASoC: codec: hdac_hdmi add device_link to card device
-
-From: Libin Yang <libin.yang@intel.com>
-
-commit 01c8327667c249818d3712c3e25c7ad2aca7f389 upstream.
-
-In resume from S3, HDAC HDMI codec driver dapm event callback may be
-operated before HDMI codec driver turns on the display audio power
-domain because of the contest between display driver and hdmi codec driver.
-
-This patch adds the device_link between soc card device (consumer) and
-hdmi codec device (supplier) to make sure the sequence is always correct.
-
-Signed-off-by: Libin Yang <libin.yang@intel.com>
-Reviewed-by: Takashi Iwai <tiwai@suse.de>
-Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Cc: stable@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- sound/soc/codecs/hdac_hdmi.c |   11 +++++++++++
- 1 file changed, 11 insertions(+)
-
---- a/sound/soc/codecs/hdac_hdmi.c
-+++ b/sound/soc/codecs/hdac_hdmi.c
-@@ -1856,6 +1856,17 @@ static void hdmi_codec_complete(struct d
-       hdac_hdmi_skl_enable_dp12(&edev->hdac);
- 
-       /*
-+       * Setup a device_link between card device and HDMI codec device.
-+       * The card device is the consumer and the HDMI codec device is
-+       * the supplier. With this setting, we can make sure that the audio
-+       * domain in display power will be always turned on before operating
-+       * on the HDMI audio codec registers.
-+       * Let's use the flag DL_FLAG_AUTOREMOVE_CONSUMER. This can make
-+       * sure the device link is freed when the machine driver is removed.
-+       */
-+      device_link_add(component->card->dev, &hdev->dev, DL_FLAG_RPM_ACTIVE |
-+                      DL_FLAG_AUTOREMOVE_CONSUMER);
-+      /*
-        * As the ELD notify callback request is not entertained while the
-        * device is in suspend state. Need to manually check detection of
-        * all pins here. pin capablity change is not support, so use the

diff --git a/queue-4.14/series b/queue-4.14/series
index 3a24df5e19be278353449264f5cfda180aee9c11..f961062ee538225107c114d5943510336a06de79 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -28,4 +28,3 @@ alsa-hda-hdmi-consider-eld_valid-when-reporting-jack-event.patch
 alsa-hda-realtek-eapd-turn-on-later.patch
 asoc-max98090-fix-restore-of-dapm-muxes.patch
 asoc-rt5677-spi-disable-16bit-spi-transfers.patch
-asoc-codec-hdac_hdmi-add-device_link-to-card-device.patch

diff --git a/queue-4.9/asoc-codec-hdac_hdmi-add-device_link-to-card-device.patch b/queue-4.9/asoc-codec-hdac_hdmi-add-device_link-to-card-device.patch
deleted file mode 100644 (file)
index 51be282..0000000
--- a/queue-4.9/asoc-codec-hdac_hdmi-add-device_link-to-card-device.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 01c8327667c249818d3712c3e25c7ad2aca7f389 Mon Sep 17 00:00:00 2001
-From: Libin Yang <libin.yang@intel.com>
-Date: Sat, 13 Apr 2019 21:18:12 +0800
-Subject: ASoC: codec: hdac_hdmi add device_link to card device
-
-From: Libin Yang <libin.yang@intel.com>
-
-commit 01c8327667c249818d3712c3e25c7ad2aca7f389 upstream.
-
-In resume from S3, HDAC HDMI codec driver dapm event callback may be
-operated before HDMI codec driver turns on the display audio power
-domain because of the contest between display driver and hdmi codec driver.
-
-This patch adds the device_link between soc card device (consumer) and
-hdmi codec device (supplier) to make sure the sequence is always correct.
-
-Signed-off-by: Libin Yang <libin.yang@intel.com>
-Reviewed-by: Takashi Iwai <tiwai@suse.de>
-Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Cc: stable@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- sound/soc/codecs/hdac_hdmi.c |   11 +++++++++++
- 1 file changed, 11 insertions(+)
-
---- a/sound/soc/codecs/hdac_hdmi.c
-+++ b/sound/soc/codecs/hdac_hdmi.c
-@@ -1741,6 +1741,17 @@ static int hdac_hdmi_runtime_suspend(str
-               return 0;
- 
-       /*
-+       * Setup a device_link between card device and HDMI codec device.
-+       * The card device is the consumer and the HDMI codec device is
-+       * the supplier. With this setting, we can make sure that the audio
-+       * domain in display power will be always turned on before operating
-+       * on the HDMI audio codec registers.
-+       * Let's use the flag DL_FLAG_AUTOREMOVE_CONSUMER. This can make
-+       * sure the device link is freed when the machine driver is removed.
-+       */
-+      device_link_add(component->card->dev, &hdev->dev, DL_FLAG_RPM_ACTIVE |
-+                      DL_FLAG_AUTOREMOVE_CONSUMER);
-+      /*
-        * Power down afg.
-        * codec_read is preferred over codec_write to set the power state.
-        * This way verb is send to set the power state and response

diff --git a/queue-4.9/series b/queue-4.9/series
index 2bd0eff0230d374ad2a4b000ae3bfe03e67996d4..b29b3d512010f26cbecc16ee7bbceac7504d4314 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -19,4 +19,3 @@ alsa-hda-hdmi-consider-eld_valid-when-reporting-jack-event.patch
 alsa-hda-realtek-eapd-turn-on-later.patch
 asoc-max98090-fix-restore-of-dapm-muxes.patch
 asoc-rt5677-spi-disable-16bit-spi-transfers.patch
-asoc-codec-hdac_hdmi-add-device_link-to-card-device.patch