drop broken aosp patch, and the dependant one.

diff --git a/queue-5.10/asoc-intel-sof_sdw-add-quirk-support-for-brya-and-bt.patch b/queue-5.10/asoc-intel-sof_sdw-add-quirk-support-for-brya-and-bt.patch
deleted file mode 100644 (file)
index df048bb..0000000
--- a/queue-5.10/asoc-intel-sof_sdw-add-quirk-support-for-brya-and-bt.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 7ed74424ab4149a5ea69fdc57a797ee9df443149 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 21 May 2021 18:56:32 +0300
-Subject: ASoC: Intel: sof_sdw: add quirk support for Brya and BT-offload
-
-From: Vamshi Krishna Gopal <vamshi.krishna.gopal@intel.com>
-
-[ Upstream commit 03effde3a2ea1d82c4dd6b634fc6174545d2c34f ]
-
-Brya is another ADL-P product.
-
-AlderLake has support for Bluetooth audio offload capability.
-Enable the BT-offload quirk for ADL-P Brya and the Intel RVP.
-
-Signed-off-by: Vamshi Krishna Gopal <vamshi.krishna.gopal@intel.com>
-Signed-off-by: Yong Zhi <yong.zhi@intel.com>
-Reviewed-by: Bard Liao <bard.liao@intel.com>
-Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
-Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
-Link: https://lore.kernel.org/r/20210521155632.3736393-2-kai.vehmanen@linux.intel.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/soc/intel/boards/sof_sdw.c | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
-index 75a0bfedb449..f0a9aad4f385 100644
---- a/sound/soc/intel/boards/sof_sdw.c
-+++ b/sound/soc/intel/boards/sof_sdw.c
-@@ -197,7 +197,21 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
-               .driver_data = (void *)(SOF_RT711_JD_SRC_JD1 |
-                                       SOF_SDW_TGL_HDMI |
-                                       SOF_RT715_DAI_ID_FIX |
--                                      SOF_SDW_PCH_DMIC),
-+                                      SOF_SDW_PCH_DMIC |
-+                                      SOF_BT_OFFLOAD_SSP(2) |
-+                                      SOF_SSP_BT_OFFLOAD_PRESENT),
-+      },
-+      {
-+              .callback = sof_sdw_quirk_cb,
-+              .matches = {
-+                      DMI_MATCH(DMI_SYS_VENDOR, "Google"),
-+                      DMI_MATCH(DMI_PRODUCT_NAME, "Brya"),
-+              },
-+              .driver_data = (void *)(SOF_SDW_TGL_HDMI |
-+                                      SOF_SDW_PCH_DMIC |
-+                                      SOF_SDW_FOUR_SPK |
-+                                      SOF_BT_OFFLOAD_SSP(2) |
-+                                      SOF_SSP_BT_OFFLOAD_PRESENT),
-       },
-       {}
- };
--- 
-2.30.2
-

diff --git a/queue-5.10/asoc-intel-sof_sdw-use-mach-data-for-adl-rvp-dmic-co.patch b/queue-5.10/asoc-intel-sof_sdw-use-mach-data-for-adl-rvp-dmic-co.patch
deleted file mode 100644 (file)
index 1ef8c8a..0000000
--- a/queue-5.10/asoc-intel-sof_sdw-use-mach-data-for-adl-rvp-dmic-co.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 99c9d5a695ff84213937e137d5555abd01a0b63e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 21 Jun 2021 14:40:48 -0500
-Subject: ASoC: Intel: sof_sdw: use mach data for ADL RVP DMIC count
-
-From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
-
-[ Upstream commit 505351329d26e684588a6919c0407b8a0f5c3813 ]
-
-On the reference boards, number of PCH dmics may vary and the number
-should be taken from driver machine data. Remove the SOF_SDW_PCH_DMIC
-quirk to make DMIC number configurable.
-
-Fixes:d25bbe80485f8 ("ASoC: Intel: sof_sdw: add quirk for new ADL-P Rvp")
-
-BugLink: https://github.com/thesofproject/sof/issues/4185
-Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
-Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
-Link: https://lore.kernel.org/r/20210621194057.21711-2-pierre-louis.bossart@linux.intel.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/soc/intel/boards/sof_sdw.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
-index f0a9aad4f385..2a7b5de6da60 100644
---- a/sound/soc/intel/boards/sof_sdw.c
-+++ b/sound/soc/intel/boards/sof_sdw.c
-@@ -197,7 +197,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
-               .driver_data = (void *)(SOF_RT711_JD_SRC_JD1 |
-                                       SOF_SDW_TGL_HDMI |
-                                       SOF_RT715_DAI_ID_FIX |
--                                      SOF_SDW_PCH_DMIC |
-                                       SOF_BT_OFFLOAD_SSP(2) |
-                                       SOF_SSP_BT_OFFLOAD_PRESENT),
-       },
--- 
-2.30.2
-

diff --git a/queue-5.10/series b/queue-5.10/series
index b0b8479c1788acd83981b447667112441a327e65..77a1e5b5f417eb37f502f7bae42b9e95d86cf16d 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -542,8 +542,6 @@ powerpc-powernv-fix-machine-check-reporting-of-async.patch
 asoc-atmel-i2s-fix-usage-of-capture-and-playback-at-.patch
 configfs-fix-memleak-in-configfs_release_bin_file.patch
 asoc-intel-sof_sdw-add-sof_rt715_dai_id_fix-for-alde.patch
-asoc-intel-sof_sdw-add-quirk-support-for-brya-and-bt.patch
-asoc-intel-sof_sdw-use-mach-data-for-adl-rvp-dmic-co.patch
 asoc-fsl_spdif-fix-unexpected-interrupt-after-suspen.patch
 leds-as3645a-fix-error-return-code-in-as3645a_parse_.patch
 leds-ktd2692-fix-an-error-handling-path.patch

diff --git a/queue-5.12/asoc-intel-sof_sdw-add-quirk-support-for-brya-and-bt.patch b/queue-5.12/asoc-intel-sof_sdw-add-quirk-support-for-brya-and-bt.patch
deleted file mode 100644 (file)
index a31bbd0..0000000
--- a/queue-5.12/asoc-intel-sof_sdw-add-quirk-support-for-brya-and-bt.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 9a7c63c291a740868982cbe30d27723d9cc29d8a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 21 May 2021 18:56:32 +0300
-Subject: ASoC: Intel: sof_sdw: add quirk support for Brya and BT-offload
-
-From: Vamshi Krishna Gopal <vamshi.krishna.gopal@intel.com>
-
-[ Upstream commit 03effde3a2ea1d82c4dd6b634fc6174545d2c34f ]
-
-Brya is another ADL-P product.
-
-AlderLake has support for Bluetooth audio offload capability.
-Enable the BT-offload quirk for ADL-P Brya and the Intel RVP.
-
-Signed-off-by: Vamshi Krishna Gopal <vamshi.krishna.gopal@intel.com>
-Signed-off-by: Yong Zhi <yong.zhi@intel.com>
-Reviewed-by: Bard Liao <bard.liao@intel.com>
-Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
-Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
-Link: https://lore.kernel.org/r/20210521155632.3736393-2-kai.vehmanen@linux.intel.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/soc/intel/boards/sof_sdw.c | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
-index dfad2ad129ab..35ad448902c7 100644
---- a/sound/soc/intel/boards/sof_sdw.c
-+++ b/sound/soc/intel/boards/sof_sdw.c
-@@ -197,7 +197,21 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
-               .driver_data = (void *)(SOF_RT711_JD_SRC_JD1 |
-                                       SOF_SDW_TGL_HDMI |
-                                       SOF_RT715_DAI_ID_FIX |
--                                      SOF_SDW_PCH_DMIC),
-+                                      SOF_SDW_PCH_DMIC |
-+                                      SOF_BT_OFFLOAD_SSP(2) |
-+                                      SOF_SSP_BT_OFFLOAD_PRESENT),
-+      },
-+      {
-+              .callback = sof_sdw_quirk_cb,
-+              .matches = {
-+                      DMI_MATCH(DMI_SYS_VENDOR, "Google"),
-+                      DMI_MATCH(DMI_PRODUCT_NAME, "Brya"),
-+              },
-+              .driver_data = (void *)(SOF_SDW_TGL_HDMI |
-+                                      SOF_SDW_PCH_DMIC |
-+                                      SOF_SDW_FOUR_SPK |
-+                                      SOF_BT_OFFLOAD_SSP(2) |
-+                                      SOF_SSP_BT_OFFLOAD_PRESENT),
-       },
-       {}
- };
--- 
-2.30.2
-

diff --git a/queue-5.12/asoc-intel-sof_sdw-use-mach-data-for-adl-rvp-dmic-co.patch b/queue-5.12/asoc-intel-sof_sdw-use-mach-data-for-adl-rvp-dmic-co.patch
deleted file mode 100644 (file)
index 77f0bbb..0000000
--- a/queue-5.12/asoc-intel-sof_sdw-use-mach-data-for-adl-rvp-dmic-co.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 95e2f41bc8e9f9cb375586e7fb84aa944e83d53b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 21 Jun 2021 14:40:48 -0500
-Subject: ASoC: Intel: sof_sdw: use mach data for ADL RVP DMIC count
-
-From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
-
-[ Upstream commit 505351329d26e684588a6919c0407b8a0f5c3813 ]
-
-On the reference boards, number of PCH dmics may vary and the number
-should be taken from driver machine data. Remove the SOF_SDW_PCH_DMIC
-quirk to make DMIC number configurable.
-
-Fixes:d25bbe80485f8 ("ASoC: Intel: sof_sdw: add quirk for new ADL-P Rvp")
-
-BugLink: https://github.com/thesofproject/sof/issues/4185
-Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
-Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
-Link: https://lore.kernel.org/r/20210621194057.21711-2-pierre-louis.bossart@linux.intel.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/soc/intel/boards/sof_sdw.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
-index 35ad448902c7..dd93f663803b 100644
---- a/sound/soc/intel/boards/sof_sdw.c
-+++ b/sound/soc/intel/boards/sof_sdw.c
-@@ -197,7 +197,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
-               .driver_data = (void *)(SOF_RT711_JD_SRC_JD1 |
-                                       SOF_SDW_TGL_HDMI |
-                                       SOF_RT715_DAI_ID_FIX |
--                                      SOF_SDW_PCH_DMIC |
-                                       SOF_BT_OFFLOAD_SSP(2) |
-                                       SOF_SSP_BT_OFFLOAD_PRESENT),
-       },
--- 
-2.30.2
-

diff --git a/queue-5.12/series b/queue-5.12/series
index 1ce5523755e5413df2dd9b508f5276da442f18e8..c78c19ae4884e6ddd4ac6981391ed904a659309d 100644 (file)
--- a/queue-5.12/series
+++ b/queue-5.12/series
@@ -644,8 +644,6 @@ asoc-atmel-i2s-fix-usage-of-capture-and-playback-at-.patch
 asoc-fsl_xcvr-disable-all-interrupts-when-suspend-ha.patch
 configfs-fix-memleak-in-configfs_release_bin_file.patch
 asoc-intel-sof_sdw-add-sof_rt715_dai_id_fix-for-alde.patch
-asoc-intel-sof_sdw-add-quirk-support-for-brya-and-bt.patch
-asoc-intel-sof_sdw-use-mach-data-for-adl-rvp-dmic-co.patch
 asoc-fsl_spdif-fix-unexpected-interrupt-after-suspen.patch
 leds-as3645a-fix-error-return-code-in-as3645a_parse_.patch
 leds-ktd2692-fix-an-error-handling-path.patch

diff --git a/queue-5.13/asoc-intel-sof_sdw-add-quirk-support-for-brya-and-bt.patch b/queue-5.13/asoc-intel-sof_sdw-add-quirk-support-for-brya-and-bt.patch
deleted file mode 100644 (file)
index f3d78e7..0000000
--- a/queue-5.13/asoc-intel-sof_sdw-add-quirk-support-for-brya-and-bt.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From bb130a22051dd935c10f4e2fe1ad2daa60717fa9 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 21 May 2021 18:56:32 +0300
-Subject: ASoC: Intel: sof_sdw: add quirk support for Brya and BT-offload
-
-From: Vamshi Krishna Gopal <vamshi.krishna.gopal@intel.com>
-
-[ Upstream commit 03effde3a2ea1d82c4dd6b634fc6174545d2c34f ]
-
-Brya is another ADL-P product.
-
-AlderLake has support for Bluetooth audio offload capability.
-Enable the BT-offload quirk for ADL-P Brya and the Intel RVP.
-
-Signed-off-by: Vamshi Krishna Gopal <vamshi.krishna.gopal@intel.com>
-Signed-off-by: Yong Zhi <yong.zhi@intel.com>
-Reviewed-by: Bard Liao <bard.liao@intel.com>
-Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
-Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
-Link: https://lore.kernel.org/r/20210521155632.3736393-2-kai.vehmanen@linux.intel.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/soc/intel/boards/sof_sdw.c | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
-index dfad2ad129ab..35ad448902c7 100644
---- a/sound/soc/intel/boards/sof_sdw.c
-+++ b/sound/soc/intel/boards/sof_sdw.c
-@@ -197,7 +197,21 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
-               .driver_data = (void *)(SOF_RT711_JD_SRC_JD1 |
-                                       SOF_SDW_TGL_HDMI |
-                                       SOF_RT715_DAI_ID_FIX |
--                                      SOF_SDW_PCH_DMIC),
-+                                      SOF_SDW_PCH_DMIC |
-+                                      SOF_BT_OFFLOAD_SSP(2) |
-+                                      SOF_SSP_BT_OFFLOAD_PRESENT),
-+      },
-+      {
-+              .callback = sof_sdw_quirk_cb,
-+              .matches = {
-+                      DMI_MATCH(DMI_SYS_VENDOR, "Google"),
-+                      DMI_MATCH(DMI_PRODUCT_NAME, "Brya"),
-+              },
-+              .driver_data = (void *)(SOF_SDW_TGL_HDMI |
-+                                      SOF_SDW_PCH_DMIC |
-+                                      SOF_SDW_FOUR_SPK |
-+                                      SOF_BT_OFFLOAD_SSP(2) |
-+                                      SOF_SSP_BT_OFFLOAD_PRESENT),
-       },
-       {}
- };
--- 
-2.30.2
-

diff --git a/queue-5.13/asoc-intel-sof_sdw-use-mach-data-for-adl-rvp-dmic-co.patch b/queue-5.13/asoc-intel-sof_sdw-use-mach-data-for-adl-rvp-dmic-co.patch
deleted file mode 100644 (file)
index de44165..0000000
--- a/queue-5.13/asoc-intel-sof_sdw-use-mach-data-for-adl-rvp-dmic-co.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 703d7f915266290b1793d2cf132dead459f3647d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 21 Jun 2021 14:40:48 -0500
-Subject: ASoC: Intel: sof_sdw: use mach data for ADL RVP DMIC count
-
-From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
-
-[ Upstream commit 505351329d26e684588a6919c0407b8a0f5c3813 ]
-
-On the reference boards, number of PCH dmics may vary and the number
-should be taken from driver machine data. Remove the SOF_SDW_PCH_DMIC
-quirk to make DMIC number configurable.
-
-Fixes:d25bbe80485f8 ("ASoC: Intel: sof_sdw: add quirk for new ADL-P Rvp")
-
-BugLink: https://github.com/thesofproject/sof/issues/4185
-Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
-Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
-Link: https://lore.kernel.org/r/20210621194057.21711-2-pierre-louis.bossart@linux.intel.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/soc/intel/boards/sof_sdw.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
-index 35ad448902c7..dd93f663803b 100644
---- a/sound/soc/intel/boards/sof_sdw.c
-+++ b/sound/soc/intel/boards/sof_sdw.c
-@@ -197,7 +197,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
-               .driver_data = (void *)(SOF_RT711_JD_SRC_JD1 |
-                                       SOF_SDW_TGL_HDMI |
-                                       SOF_RT715_DAI_ID_FIX |
--                                      SOF_SDW_PCH_DMIC |
-                                       SOF_BT_OFFLOAD_SSP(2) |
-                                       SOF_SSP_BT_OFFLOAD_PRESENT),
-       },
--- 
-2.30.2
-

diff --git a/queue-5.13/series b/queue-5.13/series
index c02251ec0b422a716a287818ff3f53b18b8eb71c..a5e97aca7e4198760fa608769b6f3b75c0b48285 100644 (file)
--- a/queue-5.13/series
+++ b/queue-5.13/series
@@ -740,8 +740,6 @@ asoc-atmel-i2s-fix-usage-of-capture-and-playback-at-.patch
 asoc-fsl_xcvr-disable-all-interrupts-when-suspend-ha.patch
 configfs-fix-memleak-in-configfs_release_bin_file.patch
 asoc-intel-sof_sdw-add-sof_rt715_dai_id_fix-for-alde.patch
-asoc-intel-sof_sdw-add-quirk-support-for-brya-and-bt.patch
-asoc-intel-sof_sdw-use-mach-data-for-adl-rvp-dmic-co.patch
 asoc-fsl_spdif-fix-unexpected-interrupt-after-suspen.patch
 leds-as3645a-fix-error-return-code-in-as3645a_parse_.patch
 leds-ktd2692-fix-an-error-handling-path.patch