Skip to contentSkip to conversation

ASoC: imx-wm8962: Remove machine driver

PATCH Superseded Fabio Estevam 2 participants 3 messages Feb 26, 2018 – Feb 27, 2018

Subsystems (5)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH v3 1/1 ASoC: imx-wm8962: Remove machine driver

From: Fabio Estevam <[email protected]>

fsl-asoc-card machine driver also handles wm8962, so there is really no need for keeping the dedicated imx-wm8962 driver anymore.

Remove the imx-wm8962 machine driver.

---
Changes since v2:
- Also remove the dt-bindings

 .../devicetree/bindings/sound/imx-audio-wm8962.txt |  53 ----
 sound/soc/fsl/Kconfig                              |  11 -
 sound/soc/fsl/Makefile                             |   2 -
 sound/soc/fsl/imx-wm8962.c                         | 312 ---------------------
 4 files changed, 378 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt
 delete mode 100644 sound/soc/fsl/imx-wm8962.c
Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt deleted +0 -53
deleted file mode 100644
index acea71b..0000000
@@ -1,53 +0,0 @@
-Freescale i.MX audio complex with WM8962 codec
-
-Required properties:
-
-  - compatible		: "fsl,imx-audio-wm8962"
-
-  - model		: The user-visible name of this sound complex
-
-  - ssi-controller	: The phandle of the i.MX SSI controller
-
-  - audio-codec		: The phandle of the WM8962 audio codec
-
-  - audio-routing	: A list of the connections between audio components.
-			  Each entry is a pair of strings, the first being the
-			  connection's sink, the second being the connection's
-			  source. Valid names could be power supplies, WM8962
-			  pins, and the jacks on the board:
-
-			  Power supplies:
-			   * Mic Bias
-
-			  Board connectors:
-			   * Mic Jack
-			   * Headphone Jack
-			   * Ext Spk
-
-  - mux-int-port	: The internal port of the i.MX audio muxer (AUDMUX)
-
-  - mux-ext-port	: The external port of the i.MX audio muxer
-
-Note: The AUDMUX port numbering should start at 1, which is consistent with
-hardware manual.
-
-Example:
-
-sound {
-	compatible = "fsl,imx6q-sabresd-wm8962",
-		     "fsl,imx-audio-wm8962";
-	model = "wm8962-audio";
-	ssi-controller = <&ssi2>;
-	audio-codec = <&codec>;
-		audio-routing =
-		"Headphone Jack", "HPOUTL",
-		"Headphone Jack", "HPOUTR",
-		"Ext Spk", "SPKOUTL",
-		"Ext Spk", "SPKOUTR",
-		"MICBIAS", "AMIC",
-		"IN3R", "MICBIAS",
-		"DMIC", "MICBIAS",
-		"DMICDAT", "DMIC";
-	mux-int-port = <2>;
-	mux-ext-port = <3>;
-};
sound/soc/fsl/Kconfig +0 -11
index 37f9b62..6ec19fb 100644
@@ -231,17 +231,6 @@ config SND_SOC_EUKREA_TLV320
 	  Enable I2S based access to the TLV320AIC23B codec attached
 	  to the SSI interface
 
-config SND_SOC_IMX_WM8962
-	tristate "SoC Audio support for i.MX boards with wm8962"
-	depends on OF && I2C && INPUT
-	select SND_SOC_WM8962
-	select SND_SOC_IMX_PCM_DMA
-	select SND_SOC_IMX_AUDMUX
-	select SND_SOC_FSL_SSI
-	help
-	  Say Y if you want to add support for SoC audio on an i.MX board with
-	  a wm8962 codec.
-
 config SND_SOC_IMX_ES8328
 	tristate "SoC Audio support for i.MX boards with the ES8328 codec"
 	depends on OF && (I2C || SPI)
sound/soc/fsl/Makefile +0 -2
index c67bf11..de94fa0 100644
@@ -55,7 +55,6 @@ 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-wm8962-objs := imx-wm8962.o
 snd-soc-imx-spdif-objs := imx-spdif.o
 snd-soc-imx-mc13783-objs := imx-mc13783.o
 
@@ -65,6 +64,5 @@ 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_WM8962) += snd-soc-imx-wm8962.o
 obj-$(CONFIG_SND_SOC_IMX_SPDIF) += snd-soc-imx-spdif.o
 obj-$(CONFIG_SND_SOC_IMX_MC13783) += snd-soc-imx-mc13783.o
sound/soc/fsl/imx-wm8962.c deleted +0 -312

312 lines not on this page · raw message

Signature · 1 line
2.7.4
reviewer
#1 lore raw
Quoted 9 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

fsl-asoc-card machine driver also handles wm8962, so there is really no need for keeping the dedicated imx-wm8962 driver anymore.

Remove the imx-wm8962 machine driver.

Did you verify it on a certain hardware? If so, I may give my Ack directly as it looks good to me. Otherwise, I would need to test.

Quoted 5 lines

---
Changes since v2:
- Also remove the dt-bindings

 .../devicetree/bindings/sound/imx-audio-wm8962.txt |  53 ----

And could you please also remove line 31 at Documentation/devicetree/bindings/sound/fsl-asoc-card.txt ?

Since this imx-audio-wm8962.txt will be removed, that line could be removed too. Thanks.

author reviewer
#2 lore raw
Quoted 2 lines · Nicolin Chen

Did you verify it on a certain hardware? If so, I may give my Ack directly as it looks good to me. Otherwise, I would need to test.

Yes, I tested it on a imx6q-sabresd.

Quoted 5 lines

And could you please also remove line 31 at Documentation/devicetree/bindings/sound/fsl-asoc-card.txt ?

Since this imx-audio-wm8962.txt will be removed, that line could be removed too. Thanks.

Just sent v4 with your suggestion.