From: Sasha Levin Date: Mon, 19 Jul 2021 16:03:26 +0000 (-0400) Subject: Drop asoc-intel-sof_sdw-add-quirk-support-for-brya-and-bt.patch X-Git-Tag: v5.13.4~16 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52088f06fa81d05d6a4ef542cd3701fe6b262620;p=thirdparty%2Fkernel%2Fstable-queue.git Drop asoc-intel-sof_sdw-add-quirk-support-for-brya-and-bt.patch Signed-off-by: Sasha Levin --- 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 index 5761138116e..00000000000 --- a/queue-5.10/asoc-intel-sof_sdw-add-quirk-support-for-brya-and-bt.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 4a384d84db4552361c6275888b656ce538d41190 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -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 - -[ 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 -Signed-off-by: Yong Zhi -Reviewed-by: Bard Liao -Reviewed-by: Ranjani Sridharan -Signed-off-by: Kai Vehmanen -Link: https://lore.kernel.org/r/20210521155632.3736393-2-kai.vehmanen@linux.intel.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - 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 2770e8179983..f6d957ff61d6 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/series b/queue-5.10/series index 0adbdf440a3..6d474801910 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -39,7 +39,6 @@ alsa-usx2y-don-t-call-free_pages_exact-with-null-add.patch revert-alsa-bebob-oxfw-fix-kconfig-entry-for-mackie-.patch usb-common-usb-conn-gpio-fix-null-pointer-dereferenc.patch w1-ds2438-fixing-bug-that-would-always-get-page0.patch -asoc-intel-sof_sdw-add-quirk-support-for-brya-and-bt.patch scsi-arcmsr-fix-doorbell-status-being-updated-late-o.patch scsi-hisi_sas-propagate-errors-in-interrupt_init_v1_.patch scsi-lpfc-fix-unexpected-timeout-error-in-direct-att.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 index d12114e723d..00000000000 --- a/queue-5.12/asoc-intel-sof_sdw-add-quirk-support-for-brya-and-bt.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 697508993345aba28a8db4f198b9c87bfd82da4b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -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 - -[ 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 -Signed-off-by: Yong Zhi -Reviewed-by: Bard Liao -Reviewed-by: Ranjani Sridharan -Signed-off-by: Kai Vehmanen -Link: https://lore.kernel.org/r/20210521155632.3736393-2-kai.vehmanen@linux.intel.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - 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 5827a16773c9..2ba3eefb9c8d 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/series b/queue-5.12/series index 9c5d4ae3f58..1dda2792043 100644 --- a/queue-5.12/series +++ b/queue-5.12/series @@ -52,7 +52,6 @@ alsa-usx2y-don-t-call-free_pages_exact-with-null-add.patch revert-alsa-bebob-oxfw-fix-kconfig-entry-for-mackie-.patch usb-common-usb-conn-gpio-fix-null-pointer-dereferenc.patch w1-ds2438-fixing-bug-that-would-always-get-page0.patch -asoc-intel-sof_sdw-add-quirk-support-for-brya-and-bt.patch scsi-arcmsr-fix-doorbell-status-being-updated-late-o.patch scsi-hisi_sas-propagate-errors-in-interrupt_init_v1_.patch scsi-lpfc-fix-unexpected-timeout-error-in-direct-att.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 index 0612d7c299b..00000000000 --- a/queue-5.13/asoc-intel-sof_sdw-add-quirk-support-for-brya-and-bt.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 6c0a79a5cce70a4a7ef3a52f606031b561b2ace3 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -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 - -[ 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 -Signed-off-by: Yong Zhi -Reviewed-by: Bard Liao -Reviewed-by: Ranjani Sridharan -Signed-off-by: Kai Vehmanen -Link: https://lore.kernel.org/r/20210521155632.3736393-2-kai.vehmanen@linux.intel.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - 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 5827a16773c9..2ba3eefb9c8d 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/series b/queue-5.13/series index d400925556b..ff4fae922bb 100644 --- a/queue-5.13/series +++ b/queue-5.13/series @@ -61,7 +61,6 @@ revert-alsa-bebob-oxfw-fix-kconfig-entry-for-mackie-.patch usb-common-usb-conn-gpio-fix-null-pointer-dereferenc.patch asoc-sof-topology-fix-assignment-to-use-le32_to_cpu.patch w1-ds2438-fixing-bug-that-would-always-get-page0.patch -asoc-intel-sof_sdw-add-quirk-support-for-brya-and-bt.patch scsi-arcmsr-fix-doorbell-status-being-updated-late-o.patch scsi-hisi_sas-propagate-errors-in-interrupt_init_v1_.patch scsi-lpfc-fix-unexpected-timeout-error-in-direct-att.patch