Skip to contentSkip to conversation

ASoC: wm1133-ev1: Remove unused driver

PATCH In review Fabio Estevam 2 participants 7 messages Nov 11, 2020 – Nov 12, 2020

Subsystems (4)
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/6 ASoC: wm1133-ev1: Remove unused driver

Since commit c93197b0041d ("ARM: imx: Remove i.MX31 board files"), the MACH_MX31ADS_WM1133_EV1 non-DT platform is no longer supported, so get rid of its machine audio driver too.

---
 sound/soc/fsl/Kconfig      |  11 --
 sound/soc/fsl/Makefile     |   2 -
 sound/soc/fsl/wm1133-ev1.c | 289 -------------------------------------
 3 files changed, 302 deletions(-)
 delete mode 100644 sound/soc/fsl/wm1133-ev1.c
sound/soc/fsl/Kconfig +0 -11
index 52a562215008..3ad547193df8 100644
@@ -239,17 +239,6 @@ config SND_SOC_IMX_SSI
 
 comment "SoC Audio support for Freescale i.MX boards:"
 
-config SND_MXC_SOC_WM1133_EV1
-	tristate "Audio on the i.MX31ADS with WM1133-EV1 fitted"
-	depends on MACH_MX31ADS_WM1133_EV1
-	select SND_SOC_WM8350
-	select SND_SOC_IMX_PCM_FIQ
-	select SND_SOC_IMX_AUDMUX
-	select SND_SOC_IMX_SSI
-	help
-	  Enable support for audio on the i.MX31ADS with the WM1133-EV1
-	  PMIC board with WM8835x fitted.
-
 config SND_SOC_MX27VIS_AIC32X4
 	tristate "SoC audio support for Visstrim M10 boards"
 	depends on MACH_IMX27_VISSTRIM_M10 && I2C
sound/soc/fsl/Makefile +0 -2
index 2181b7f9f677..8d3e40415050 100644
@@ -65,7 +65,6 @@ obj-$(CONFIG_SND_SOC_IMX_PCM_DMA) += imx-pcm-dma.o
 snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o
 snd-soc-phycore-ac97-objs := phycore-ac97.o
 snd-soc-mx27vis-aic32x4-objs := mx27vis-aic32x4.o
-snd-soc-wm1133-ev1-objs := wm1133-ev1.o
 snd-soc-imx-es8328-objs := imx-es8328.o
 snd-soc-imx-sgtl5000-objs := imx-sgtl5000.o
 snd-soc-imx-spdif-objs := imx-spdif.o
@@ -75,7 +74,6 @@ snd-soc-imx-audmix-objs := imx-audmix.o
 obj-$(CONFIG_SND_SOC_EUKREA_TLV320) += snd-soc-eukrea-tlv320.o
 obj-$(CONFIG_SND_SOC_PHYCORE_AC97) += snd-soc-phycore-ac97.o
 obj-$(CONFIG_SND_SOC_MX27VIS_AIC32X4) += snd-soc-mx27vis-aic32x4.o
-obj-$(CONFIG_SND_MXC_SOC_WM1133_EV1) += snd-soc-wm1133-ev1.o
 obj-$(CONFIG_SND_SOC_IMX_ES8328) += snd-soc-imx-es8328.o
 obj-$(CONFIG_SND_SOC_IMX_SGTL5000) += snd-soc-imx-sgtl5000.o
 obj-$(CONFIG_SND_SOC_IMX_SPDIF) += snd-soc-imx-spdif.o
sound/soc/fsl/wm1133-ev1.c deleted +0 -289

289 lines not on this page · raw message

Signature · 1 line
2.17.1
author reviewer
#1 lore raw

PATCH 2/6 ASoC: mx27vis-aic32x4: Remove unused driver

Since commit 879c0e5e0ac7 ("ARM: imx: Remove i.MX27 board files"), the MACH_IMX27_VISSTRIM_M10 non-DT platform is no longer supported, so get rid of its machine audio driver too.

---
 sound/soc/fsl/Kconfig           |  11 --
 sound/soc/fsl/Makefile          |   2 -
 sound/soc/fsl/mx27vis-aic32x4.c | 214 --------------------------------
 3 files changed, 227 deletions(-)
 delete mode 100644 sound/soc/fsl/mx27vis-aic32x4.c
sound/soc/fsl/Kconfig +0 -11
index 3ad547193df8..c18ec9310aa7 100644
@@ -239,17 +239,6 @@ config SND_SOC_IMX_SSI
 
 comment "SoC Audio support for Freescale i.MX boards:"
 
-config SND_SOC_MX27VIS_AIC32X4
-	tristate "SoC audio support for Visstrim M10 boards"
-	depends on MACH_IMX27_VISSTRIM_M10 && I2C
-	select SND_SOC_TLV320AIC32X4
-	select SND_SOC_IMX_PCM_DMA
-	select SND_SOC_IMX_AUDMUX
-	select SND_SOC_IMX_SSI
-	help
-	  Say Y if you want to add support for SoC audio on Visstrim SM10
-	  board with TLV320AIC32X4 codec.
-
 config SND_SOC_PHYCORE_AC97
 	tristate "SoC Audio support for Phytec phyCORE (and phyCARD) boards"
 	depends on MACH_PCM043 || MACH_PCA100
sound/soc/fsl/Makefile +0 -2
index 8d3e40415050..5c6058f414be 100644
@@ -64,7 +64,6 @@ obj-$(CONFIG_SND_SOC_IMX_PCM_DMA) += imx-pcm-dma.o
 # i.MX Machine Support
 snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o
 snd-soc-phycore-ac97-objs := phycore-ac97.o
-snd-soc-mx27vis-aic32x4-objs := mx27vis-aic32x4.o
 snd-soc-imx-es8328-objs := imx-es8328.o
 snd-soc-imx-sgtl5000-objs := imx-sgtl5000.o
 snd-soc-imx-spdif-objs := imx-spdif.o
@@ -73,7 +72,6 @@ snd-soc-imx-audmix-objs := imx-audmix.o
 
 obj-$(CONFIG_SND_SOC_EUKREA_TLV320) += snd-soc-eukrea-tlv320.o
 obj-$(CONFIG_SND_SOC_PHYCORE_AC97) += snd-soc-phycore-ac97.o
-obj-$(CONFIG_SND_SOC_MX27VIS_AIC32X4) += snd-soc-mx27vis-aic32x4.o
 obj-$(CONFIG_SND_SOC_IMX_ES8328) += snd-soc-imx-es8328.o
 obj-$(CONFIG_SND_SOC_IMX_SGTL5000) += snd-soc-imx-sgtl5000.o
 obj-$(CONFIG_SND_SOC_IMX_SPDIF) += snd-soc-imx-spdif.o
sound/soc/fsl/mx27vis-aic32x4.c deleted +0 -214

214 lines not on this page · raw message

Signature · 1 line
2.17.1
author reviewer
#2 lore raw

PATCH 3/6 ASoC: phycore-ac97: Remove unused driver

In reply to Fabio Estevam

Since commit e1324ece2af4 ("ARM: imx: Remove i.MX35 board files"), the MACH_PCM043 and MACH_PCA100 non-DT platform are no longer supported, so get rid of their machine audio driver too.

---
 sound/soc/fsl/Kconfig        |  12 ----
 sound/soc/fsl/Makefile       |   2 -
 sound/soc/fsl/phycore-ac97.c | 121 -----------------------------------
 3 files changed, 135 deletions(-)
 delete mode 100644 sound/soc/fsl/phycore-ac97.c
sound/soc/fsl/Kconfig +0 -12
index c18ec9310aa7..63be2bf5b509 100644
@@ -239,18 +239,6 @@ config SND_SOC_IMX_SSI
 
 comment "SoC Audio support for Freescale i.MX boards:"
 
-config SND_SOC_PHYCORE_AC97
-	tristate "SoC Audio support for Phytec phyCORE (and phyCARD) boards"
-	depends on MACH_PCM043 || MACH_PCA100
-	select SND_SOC_AC97_BUS
-	select SND_SOC_WM9712
-	select SND_SOC_IMX_PCM_FIQ
-	select SND_SOC_IMX_AUDMUX
-	select SND_SOC_IMX_SSI
-	help
-	  Say Y if you want to add support for SoC audio on Phytec phyCORE
-	  and phyCARD boards in AC97 mode
-
 config SND_SOC_EUKREA_TLV320
 	tristate "Eukrea TLV320"
 	depends on ARCH_MXC && !ARM64 && I2C
sound/soc/fsl/Makefile +0 -2
index 5c6058f414be..12755058f877 100644
@@ -63,7 +63,6 @@ obj-$(CONFIG_SND_SOC_IMX_PCM_DMA) += imx-pcm-dma.o
 
 # i.MX Machine Support
 snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o
-snd-soc-phycore-ac97-objs := phycore-ac97.o
 snd-soc-imx-es8328-objs := imx-es8328.o
 snd-soc-imx-sgtl5000-objs := imx-sgtl5000.o
 snd-soc-imx-spdif-objs := imx-spdif.o
@@ -71,7 +70,6 @@ snd-soc-imx-mc13783-objs := imx-mc13783.o
 snd-soc-imx-audmix-objs := imx-audmix.o
 
 obj-$(CONFIG_SND_SOC_EUKREA_TLV320) += snd-soc-eukrea-tlv320.o
-obj-$(CONFIG_SND_SOC_PHYCORE_AC97) += snd-soc-phycore-ac97.o
 obj-$(CONFIG_SND_SOC_IMX_ES8328) += snd-soc-imx-es8328.o
 obj-$(CONFIG_SND_SOC_IMX_SGTL5000) += snd-soc-imx-sgtl5000.o
 obj-$(CONFIG_SND_SOC_IMX_SPDIF) += snd-soc-imx-spdif.o
sound/soc/fsl/phycore-ac97.c deleted +0 -121

121 lines not on this page · raw message

Signature · 1 line
2.17.1
author reviewer
#3 lore raw

PATCH 4/6 ASoC: imx-mc13783: Remove unused driver

In reply to Fabio Estevam

The imx-mc13783 was used on imx27-pdk and imx31-pdk non-DT platforms.

Since 5.10-rc1, i.MX has been converted to a DT-only platform and all board files are gone.

Remove the imx-mc13783 audio machine driver as there is no user at all.

---
 sound/soc/fsl/Kconfig       |   8 --
 sound/soc/fsl/Makefile      |   2 -
 sound/soc/fsl/imx-mc13783.c | 156 ------------------------------------
 3 files changed, 166 deletions(-)
 delete mode 100644 sound/soc/fsl/imx-mc13783.c
sound/soc/fsl/Kconfig +0 -8
index 63be2bf5b509..1536c6d411fa 100644
@@ -283,14 +283,6 @@ config SND_SOC_IMX_SPDIF
 	  Say Y if you want to add support for SoC audio on an i.MX board with
 	  a S/DPDIF.
 
-config SND_SOC_IMX_MC13783
-	tristate "SoC Audio support for I.MX boards with mc13783"
-	depends on MFD_MC13XXX && ARM
-	select SND_SOC_IMX_SSI
-	select SND_SOC_IMX_AUDMUX
-	select SND_SOC_MC13783
-	select SND_SOC_IMX_PCM_DMA
-
 config SND_SOC_FSL_ASOC_CARD
 	tristate "Generic ASoC Sound Card with ASRC support"
 	depends on OF && I2C
sound/soc/fsl/Makefile +0 -2
index 12755058f877..5637ebbe8ab2 100644
@@ -66,12 +66,10 @@ snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o
 snd-soc-imx-es8328-objs := imx-es8328.o
 snd-soc-imx-sgtl5000-objs := imx-sgtl5000.o
 snd-soc-imx-spdif-objs := imx-spdif.o
-snd-soc-imx-mc13783-objs := imx-mc13783.o
 snd-soc-imx-audmix-objs := imx-audmix.o
 
 obj-$(CONFIG_SND_SOC_EUKREA_TLV320) += snd-soc-eukrea-tlv320.o
 obj-$(CONFIG_SND_SOC_IMX_ES8328) += snd-soc-imx-es8328.o
 obj-$(CONFIG_SND_SOC_IMX_SGTL5000) += snd-soc-imx-sgtl5000.o
 obj-$(CONFIG_SND_SOC_IMX_SPDIF) += snd-soc-imx-spdif.o
-obj-$(CONFIG_SND_SOC_IMX_MC13783) += snd-soc-imx-mc13783.o
 obj-$(CONFIG_SND_SOC_IMX_AUDMIX) += snd-soc-imx-audmix.o
sound/soc/fsl/imx-mc13783.c deleted +0 -156

156 lines not on this page · raw message

Signature · 1 line
2.17.1
author reviewer
#4 lore raw

PATCH 5/6 ASoC: fsl: eukrea: Remove the SND_SOC_IMX_SSI selection

In reply to Fabio Estevam

SND_SOC_IMX_SSI was only used by i.MX non-DT platforms.

SND_SOC_EUKREA_TLV320 already selects the SND_SOC_FSL_SSI symbol, which is enough.

Remove the unneeded SND_SOC_IMX_SSI selection.

---
 sound/soc/fsl/Kconfig | 1 -
 1 file changed, 1 deletion(-)
sound/soc/fsl/Kconfig +0 -1
index 1536c6d411fa..31897fff6c71 100644
@@ -244,7 +244,6 @@ config SND_SOC_EUKREA_TLV320
 	depends on ARCH_MXC && !ARM64 && I2C
 	select SND_SOC_TLV320AIC23_I2C
 	select SND_SOC_IMX_AUDMUX
-	select SND_SOC_IMX_SSI
 	select SND_SOC_FSL_SSI
 	select SND_SOC_IMX_PCM_DMA
 	help
Signature · 1 line
2.17.1
author reviewer
#5 lore raw

PATCH 6/6 ASoC: imx-ssi: Remove unused driver

In reply to Fabio Estevam

The imx-ssi driver was only used by i.MX non-DT platforms.

Since 5.10-rc1, i.MX has been converted to a DT-only platform and all board files are gone.

Remove the imx-ssi audio driver as there are no more users at all.

---
 sound/soc/fsl/Kconfig   |   6 +-
 sound/soc/fsl/Makefile  |   2 -
 sound/soc/fsl/imx-ssi.c | 651 ----------------------------------------
 3 files changed, 1 insertion(+), 658 deletions(-)
 delete mode 100644 sound/soc/fsl/imx-ssi.c
sound/soc/fsl/Kconfig +1 -5
index 31897fff6c71..a299f61e529e 100644
@@ -228,15 +228,11 @@ endif # SND_POWERPC_SOC
 
 config SND_SOC_IMX_PCM_FIQ
 	tristate
-	default y if SND_SOC_IMX_SSI=y && (SND_SOC_FSL_SSI=m || SND_SOC_FSL_SPDIF=m) && (MXC_TZIC || MXC_AVIC)
+	default y if (SND_SOC_FSL_SSI=m || SND_SOC_FSL_SPDIF=m) && (MXC_TZIC || MXC_AVIC)
 	select FIQ
 
 if SND_IMX_SOC
 
-config SND_SOC_IMX_SSI
-	tristate
-	select SND_SOC_FSL_UTILS
-
 comment "SoC Audio support for Freescale i.MX boards:"
 
 config SND_SOC_EUKREA_TLV320
sound/soc/fsl/Makefile +0 -2
index 5637ebbe8ab2..0b20e038b65b 100644
@@ -53,9 +53,7 @@ obj-$(CONFIG_SND_MPC52xx_SOC_PCM030) += pcm030-audio-fabric.o
 obj-$(CONFIG_SND_MPC52xx_SOC_EFIKA) += efika-audio-fabric.o
 
 # i.MX Platform Support
-snd-soc-imx-ssi-objs := imx-ssi.o
 snd-soc-imx-audmux-objs := imx-audmux.o
-obj-$(CONFIG_SND_SOC_IMX_SSI) += snd-soc-imx-ssi.o
 obj-$(CONFIG_SND_SOC_IMX_AUDMUX) += snd-soc-imx-audmux.o
 
 obj-$(CONFIG_SND_SOC_IMX_PCM_FIQ) += imx-pcm-fiq.o
sound/soc/fsl/imx-ssi.c deleted +0 -651

651 lines not on this page · raw message

Signature · 1 line
2.17.1
maintainer
#6 lore raw
In reply to Fabio Estevam
Quoted 3 lines · Fabio Estevam

Since commit c93197b0041d ("ARM: imx: Remove i.MX31 board files"), the MACH_MX31ADS_WM1133_EV1 non-DT platform is no longer supported, so get rid of its machine audio driver too.

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/6] ASoC: wm1133-ev1: Remove unused driver

      commit: 9c9fd07eb481cbfc89efa7820b3bb2b4a55eb303
[2/6] ASoC: mx27vis-aic32x4: Remove unused driver
      commit: 3fbb01fb583fd3ddd319f5a547bf10e322301a3f
[3/6] ASoC: phycore-ac97: Remove unused driver
      commit: 440534a0ecfd20235a091fb2a98c2c3adf86834e
[4/6] ASoC: imx-mc13783: Remove unused driver
      commit: 83e7e2278680207f1650949db11ba0e1b6fbc3f5
[5/6] ASoC: fsl: eukrea: Remove the SND_SOC_IMX_SSI selection
      commit: ffc64110b7e988b2fba5f68b82e18214524ac432
[6/6] ASoC: imx-ssi: Remove unused driver
      commit: c31da0b196f99c7d95c69bab96e709b72a30f509

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark