From a6259b678ddcfdaa491817030bbcc2ff18f3a0e2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 16 Jun 2020 19:14:41 +0200 Subject: [PATCH] drop imx sof patches. --- ...of-imx-fix-undefined-reference-issue.patch | 66 ------------------- .../asoc-sof-imx8-fix-randbuild-error.patch | 50 -------------- queue-5.4/series | 2 - ...of-imx-fix-undefined-reference-issue.patch | 66 ------------------- .../asoc-sof-imx8-fix-randbuild-error.patch | 50 -------------- queue-5.6/series | 2 - ...of-imx-fix-undefined-reference-issue.patch | 66 ------------------- .../asoc-sof-imx8-fix-randbuild-error.patch | 50 -------------- queue-5.7/series | 2 - 9 files changed, 354 deletions(-) delete mode 100644 queue-5.4/asoc-sof-imx-fix-undefined-reference-issue.patch delete mode 100644 queue-5.4/asoc-sof-imx8-fix-randbuild-error.patch delete mode 100644 queue-5.6/asoc-sof-imx-fix-undefined-reference-issue.patch delete mode 100644 queue-5.6/asoc-sof-imx8-fix-randbuild-error.patch delete mode 100644 queue-5.7/asoc-sof-imx-fix-undefined-reference-issue.patch delete mode 100644 queue-5.7/asoc-sof-imx8-fix-randbuild-error.patch diff --git a/queue-5.4/asoc-sof-imx-fix-undefined-reference-issue.patch b/queue-5.4/asoc-sof-imx-fix-undefined-reference-issue.patch deleted file mode 100644 index 30ea5ca3e88..00000000000 --- a/queue-5.4/asoc-sof-imx-fix-undefined-reference-issue.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 94ee421f03f02b57be81ab8bf490957c06ede44d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 9 Apr 2020 10:18:29 +0300 -Subject: ASoC: SOF: imx: fix undefined reference issue - -From: Pierre-Louis Bossart - -[ Upstream commit cb0312f61c3e95c71ec8955a94d42bf7eb5ba617 ] - -make.cross ARCH=mips allyesconfig fails with the following error: - -sound/soc/sof/sof-of-dev.o:(.data.sof_of_imx8qxp_desc+0x40): undefined -reference to `sof_imx8x_ops'. - -This seems to be a Makefile order issue, solve by using the same -structure as for Intel platforms. - -Fixes: f9ad75468453 ("ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF -dependency") -Signed-off-by: Pierre-Louis Bossart -Signed-off-by: Daniel Baluta -Link: https://lore.kernel.org/r/20200409071832.2039-3-daniel.baluta@oss.nxp.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - sound/soc/sof/imx/Kconfig | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -diff --git a/sound/soc/sof/imx/Kconfig b/sound/soc/sof/imx/Kconfig -index b4f0426685c4..d44bbbf24735 100644 ---- a/sound/soc/sof/imx/Kconfig -+++ b/sound/soc/sof/imx/Kconfig -@@ -11,17 +11,26 @@ config SND_SOC_SOF_IMX_TOPLEVEL - - if SND_SOC_SOF_IMX_TOPLEVEL - -+config SND_SOC_SOF_IMX_OF -+ def_tristate SND_SOC_SOF_OF -+ select SND_SOC_SOF_IMX8 if SND_SOC_SOF_IMX8_SUPPORT -+ help -+ This option is not user-selectable but automagically handled by -+ 'select' statements at a higher level -+ - config SND_SOC_SOF_IMX8_SUPPORT - bool "SOF support for i.MX8" -- depends on IMX_SCU -- select IMX_DSP - help - This adds support for Sound Open Firmware for NXP i.MX8 platforms - Say Y if you have such a device. - If unsure select "N". - - config SND_SOC_SOF_IMX8 -- def_tristate SND_SOC_SOF_OF -- depends on SND_SOC_SOF_IMX8_SUPPORT -+ tristate -+ depends on IMX_SCU -+ select IMX_DSP -+ help -+ This option is not user-selectable but automagically handled by -+ 'select' statements at a higher level - - endif ## SND_SOC_SOF_IMX_IMX_TOPLEVEL --- -2.25.1 - diff --git a/queue-5.4/asoc-sof-imx8-fix-randbuild-error.patch b/queue-5.4/asoc-sof-imx8-fix-randbuild-error.patch deleted file mode 100644 index 588343387f7..00000000000 --- a/queue-5.4/asoc-sof-imx8-fix-randbuild-error.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 982d52b1d94c8ccf0283b57f17e4230ba581fd41 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 9 Apr 2020 10:18:28 +0300 -Subject: ASoC: SOF: imx8: Fix randbuild error - -From: YueHaibing - -[ Upstream commit fe17e6cdc0fefca96ba9659be4b2b07487cbf0c5 ] - -when do randconfig like this: -CONFIG_SND_SOC_SOF_IMX8_SUPPORT=y -CONFIG_SND_SOC_SOF_IMX8=y -CONFIG_SND_SOC_SOF_OF=y -CONFIG_IMX_DSP=m -CONFIG_IMX_SCU=y - -there is a link error: - -sound/soc/sof/imx/imx8.o: In function 'imx8_send_msg': -imx8.c:(.text+0x380): undefined reference to 'imx_dsp_ring_doorbell' - -Select IMX_DSP in SND_SOC_SOF_IMX8_SUPPORT to fix this - -Fixes: f9ad75468453 ("ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF dependency") -Reported-by: Hulk Robot -Signed-off-by: YueHaibing -Signed-off-by: Daniel Baluta -Link: https://lore.kernel.org/r/20200409071832.2039-2-daniel.baluta@oss.nxp.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - sound/soc/sof/imx/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sound/soc/sof/imx/Kconfig b/sound/soc/sof/imx/Kconfig -index 71f318bc2c74..b4f0426685c4 100644 ---- a/sound/soc/sof/imx/Kconfig -+++ b/sound/soc/sof/imx/Kconfig -@@ -14,7 +14,7 @@ if SND_SOC_SOF_IMX_TOPLEVEL - config SND_SOC_SOF_IMX8_SUPPORT - bool "SOF support for i.MX8" - depends on IMX_SCU -- depends on IMX_DSP -+ select IMX_DSP - help - This adds support for Sound Open Firmware for NXP i.MX8 platforms - Say Y if you have such a device. --- -2.25.1 - diff --git a/queue-5.4/series b/queue-5.4/series index dd9feb1aff6..8295dc68d70 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -14,8 +14,6 @@ csky-fixup-abiv2-syscall_trace-break-a4-a5.patch gfs2-even-more-gfs2_find_jhead-fixes.patch drivers-net-ibmvnic-update-vnic-protocol-version-rep.patch powerpc-xive-clear-the-page-tables-for-the-esb-io-ma.patch -asoc-sof-imx8-fix-randbuild-error.patch -asoc-sof-imx-fix-undefined-reference-issue.patch spi-dw-fix-native-cs-being-unset.patch ath9k_htc-silence-undersized-packet-warnings.patch smack-avoid-unused-sip-variable-warning.patch diff --git a/queue-5.6/asoc-sof-imx-fix-undefined-reference-issue.patch b/queue-5.6/asoc-sof-imx-fix-undefined-reference-issue.patch deleted file mode 100644 index bfd45fb8a1e..00000000000 --- a/queue-5.6/asoc-sof-imx-fix-undefined-reference-issue.patch +++ /dev/null @@ -1,66 +0,0 @@ -From e64fd41107edbf2e2308271bcac2f04789591438 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 9 Apr 2020 10:18:29 +0300 -Subject: ASoC: SOF: imx: fix undefined reference issue - -From: Pierre-Louis Bossart - -[ Upstream commit cb0312f61c3e95c71ec8955a94d42bf7eb5ba617 ] - -make.cross ARCH=mips allyesconfig fails with the following error: - -sound/soc/sof/sof-of-dev.o:(.data.sof_of_imx8qxp_desc+0x40): undefined -reference to `sof_imx8x_ops'. - -This seems to be a Makefile order issue, solve by using the same -structure as for Intel platforms. - -Fixes: f9ad75468453 ("ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF -dependency") -Signed-off-by: Pierre-Louis Bossart -Signed-off-by: Daniel Baluta -Link: https://lore.kernel.org/r/20200409071832.2039-3-daniel.baluta@oss.nxp.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - sound/soc/sof/imx/Kconfig | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -diff --git a/sound/soc/sof/imx/Kconfig b/sound/soc/sof/imx/Kconfig -index 812749064ca8..9586635cf8ab 100644 ---- a/sound/soc/sof/imx/Kconfig -+++ b/sound/soc/sof/imx/Kconfig -@@ -11,17 +11,26 @@ config SND_SOC_SOF_IMX_TOPLEVEL - - if SND_SOC_SOF_IMX_TOPLEVEL - -+config SND_SOC_SOF_IMX_OF -+ def_tristate SND_SOC_SOF_OF -+ select SND_SOC_SOF_IMX8 if SND_SOC_SOF_IMX8_SUPPORT -+ help -+ This option is not user-selectable but automagically handled by -+ 'select' statements at a higher level -+ - config SND_SOC_SOF_IMX8_SUPPORT - bool "SOF support for i.MX8" -- depends on IMX_SCU -- select IMX_DSP - help - This adds support for Sound Open Firmware for NXP i.MX8 platforms - Say Y if you have such a device. - If unsure select "N". - - config SND_SOC_SOF_IMX8 -- def_tristate SND_SOC_SOF_OF -- depends on SND_SOC_SOF_IMX8_SUPPORT -+ tristate -+ depends on IMX_SCU -+ select IMX_DSP -+ help -+ This option is not user-selectable but automagically handled by -+ 'select' statements at a higher level - - endif ## SND_SOC_SOF_IMX_IMX_TOPLEVEL --- -2.25.1 - diff --git a/queue-5.6/asoc-sof-imx8-fix-randbuild-error.patch b/queue-5.6/asoc-sof-imx8-fix-randbuild-error.patch deleted file mode 100644 index 94a8a3a51a7..00000000000 --- a/queue-5.6/asoc-sof-imx8-fix-randbuild-error.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 7b719d9459231033d48e7763e3f805ce40647528 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 9 Apr 2020 10:18:28 +0300 -Subject: ASoC: SOF: imx8: Fix randbuild error - -From: YueHaibing - -[ Upstream commit fe17e6cdc0fefca96ba9659be4b2b07487cbf0c5 ] - -when do randconfig like this: -CONFIG_SND_SOC_SOF_IMX8_SUPPORT=y -CONFIG_SND_SOC_SOF_IMX8=y -CONFIG_SND_SOC_SOF_OF=y -CONFIG_IMX_DSP=m -CONFIG_IMX_SCU=y - -there is a link error: - -sound/soc/sof/imx/imx8.o: In function 'imx8_send_msg': -imx8.c:(.text+0x380): undefined reference to 'imx_dsp_ring_doorbell' - -Select IMX_DSP in SND_SOC_SOF_IMX8_SUPPORT to fix this - -Fixes: f9ad75468453 ("ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF dependency") -Reported-by: Hulk Robot -Signed-off-by: YueHaibing -Signed-off-by: Daniel Baluta -Link: https://lore.kernel.org/r/20200409071832.2039-2-daniel.baluta@oss.nxp.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - sound/soc/sof/imx/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sound/soc/sof/imx/Kconfig b/sound/soc/sof/imx/Kconfig -index bae4f7bf5f75..812749064ca8 100644 ---- a/sound/soc/sof/imx/Kconfig -+++ b/sound/soc/sof/imx/Kconfig -@@ -14,7 +14,7 @@ if SND_SOC_SOF_IMX_TOPLEVEL - config SND_SOC_SOF_IMX8_SUPPORT - bool "SOF support for i.MX8" - depends on IMX_SCU -- depends on IMX_DSP -+ select IMX_DSP - help - This adds support for Sound Open Firmware for NXP i.MX8 platforms - Say Y if you have such a device. --- -2.25.1 - diff --git a/queue-5.6/series b/queue-5.6/series index 8bcba697a1d..241caad293e 100644 --- a/queue-5.6/series +++ b/queue-5.6/series @@ -27,8 +27,6 @@ selftests-fix-flower-parent-qdisc.patch fanotify-fix-ignore-mask-logic-for-events-on-child-a.patch driver-core-update-device-link-status-correctly-for-.patch powerpc-xive-clear-the-page-tables-for-the-esb-io-ma.patch -asoc-sof-imx8-fix-randbuild-error.patch -asoc-sof-imx-fix-undefined-reference-issue.patch spi-dw-fix-native-cs-being-unset.patch ath9k_htc-silence-undersized-packet-warnings.patch smack-avoid-unused-sip-variable-warning.patch diff --git a/queue-5.7/asoc-sof-imx-fix-undefined-reference-issue.patch b/queue-5.7/asoc-sof-imx-fix-undefined-reference-issue.patch deleted file mode 100644 index 55cc187633e..00000000000 --- a/queue-5.7/asoc-sof-imx-fix-undefined-reference-issue.patch +++ /dev/null @@ -1,66 +0,0 @@ -From dead36a88435abfde8c64da87d4c50afa7e7ba3a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 9 Apr 2020 10:18:29 +0300 -Subject: ASoC: SOF: imx: fix undefined reference issue - -From: Pierre-Louis Bossart - -[ Upstream commit cb0312f61c3e95c71ec8955a94d42bf7eb5ba617 ] - -make.cross ARCH=mips allyesconfig fails with the following error: - -sound/soc/sof/sof-of-dev.o:(.data.sof_of_imx8qxp_desc+0x40): undefined -reference to `sof_imx8x_ops'. - -This seems to be a Makefile order issue, solve by using the same -structure as for Intel platforms. - -Fixes: f9ad75468453 ("ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF -dependency") -Signed-off-by: Pierre-Louis Bossart -Signed-off-by: Daniel Baluta -Link: https://lore.kernel.org/r/20200409071832.2039-3-daniel.baluta@oss.nxp.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - sound/soc/sof/imx/Kconfig | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -diff --git a/sound/soc/sof/imx/Kconfig b/sound/soc/sof/imx/Kconfig -index 812749064ca8..9586635cf8ab 100644 ---- a/sound/soc/sof/imx/Kconfig -+++ b/sound/soc/sof/imx/Kconfig -@@ -11,17 +11,26 @@ config SND_SOC_SOF_IMX_TOPLEVEL - - if SND_SOC_SOF_IMX_TOPLEVEL - -+config SND_SOC_SOF_IMX_OF -+ def_tristate SND_SOC_SOF_OF -+ select SND_SOC_SOF_IMX8 if SND_SOC_SOF_IMX8_SUPPORT -+ help -+ This option is not user-selectable but automagically handled by -+ 'select' statements at a higher level -+ - config SND_SOC_SOF_IMX8_SUPPORT - bool "SOF support for i.MX8" -- depends on IMX_SCU -- select IMX_DSP - help - This adds support for Sound Open Firmware for NXP i.MX8 platforms - Say Y if you have such a device. - If unsure select "N". - - config SND_SOC_SOF_IMX8 -- def_tristate SND_SOC_SOF_OF -- depends on SND_SOC_SOF_IMX8_SUPPORT -+ tristate -+ depends on IMX_SCU -+ select IMX_DSP -+ help -+ This option is not user-selectable but automagically handled by -+ 'select' statements at a higher level - - endif ## SND_SOC_SOF_IMX_IMX_TOPLEVEL --- -2.25.1 - diff --git a/queue-5.7/asoc-sof-imx8-fix-randbuild-error.patch b/queue-5.7/asoc-sof-imx8-fix-randbuild-error.patch deleted file mode 100644 index e94e4aa5f1a..00000000000 --- a/queue-5.7/asoc-sof-imx8-fix-randbuild-error.patch +++ /dev/null @@ -1,50 +0,0 @@ -From fef043431a380ea5fa30c357cdaf25feee479fdd Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 9 Apr 2020 10:18:28 +0300 -Subject: ASoC: SOF: imx8: Fix randbuild error - -From: YueHaibing - -[ Upstream commit fe17e6cdc0fefca96ba9659be4b2b07487cbf0c5 ] - -when do randconfig like this: -CONFIG_SND_SOC_SOF_IMX8_SUPPORT=y -CONFIG_SND_SOC_SOF_IMX8=y -CONFIG_SND_SOC_SOF_OF=y -CONFIG_IMX_DSP=m -CONFIG_IMX_SCU=y - -there is a link error: - -sound/soc/sof/imx/imx8.o: In function 'imx8_send_msg': -imx8.c:(.text+0x380): undefined reference to 'imx_dsp_ring_doorbell' - -Select IMX_DSP in SND_SOC_SOF_IMX8_SUPPORT to fix this - -Fixes: f9ad75468453 ("ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF dependency") -Reported-by: Hulk Robot -Signed-off-by: YueHaibing -Signed-off-by: Daniel Baluta -Link: https://lore.kernel.org/r/20200409071832.2039-2-daniel.baluta@oss.nxp.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - sound/soc/sof/imx/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sound/soc/sof/imx/Kconfig b/sound/soc/sof/imx/Kconfig -index bae4f7bf5f75..812749064ca8 100644 ---- a/sound/soc/sof/imx/Kconfig -+++ b/sound/soc/sof/imx/Kconfig -@@ -14,7 +14,7 @@ if SND_SOC_SOF_IMX_TOPLEVEL - config SND_SOC_SOF_IMX8_SUPPORT - bool "SOF support for i.MX8" - depends on IMX_SCU -- depends on IMX_DSP -+ select IMX_DSP - help - This adds support for Sound Open Firmware for NXP i.MX8 platforms - Say Y if you have such a device. --- -2.25.1 - diff --git a/queue-5.7/series b/queue-5.7/series index 5802e5e9b25..e955752138f 100644 --- a/queue-5.7/series +++ b/queue-5.7/series @@ -19,8 +19,6 @@ perf-probe-accept-the-instance-number-of-kretprobe-e.patch driver-core-update-device-link-status-correctly-for-.patch fanotify-fix-ignore-mask-logic-for-events-on-child-a.patch powerpc-xive-clear-the-page-tables-for-the-esb-io-ma.patch -asoc-sof-imx8-fix-randbuild-error.patch -asoc-sof-imx-fix-undefined-reference-issue.patch spi-dw-fix-native-cs-being-unset.patch ath9k_htc-silence-undersized-packet-warnings.patch smack-avoid-unused-sip-variable-warning.patch -- 2.47.3