[PATCH 7/7] ARM: dts: imx53-voipac-bsb: Switch using simple-audio-card for audio support
From: Alexander Shiyan <hidden>
Date: 2016-06-11 05:02:25
Subsystem:
the rest · Maintainer:
Linus Torvalds
The sound support can be handled by "simple-audio-card" instead of use a private driver. Signed-off-by: Alexander Shiyan <redacted> --- arch/arm/boot/dts/imx53-voipac-bsb.dts | 55 ++++++++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/imx53-voipac-bsb.dts b/arch/arm/boot/dts/imx53-voipac-bsb.dts
index fc51b87..ad00e98 100644
--- a/arch/arm/boot/dts/imx53-voipac-bsb.dts
+++ b/arch/arm/boot/dts/imx53-voipac-bsb.dts@@ -10,19 +10,35 @@ */ /dts-v1/; +#include <dt-bindings/sound/fsl-imx-audmux.h> + #include "imx53-voipac-dmm-668.dtsi" / { sound { - compatible = "fsl,imx53-voipac-sgtl5000", - "fsl,imx-audio-sgtl5000"; - model = "imx53-voipac-sgtl5000"; - ssi-controller = <&ssi2>; - audio-codec = <&sgtl5000>; - audio-routing = + compatible = "simple-audio-card"; + simple-audio-card,name = "imx53-voipac-sgtl5000"; + simple-audio-card,format = "i2s"; + simple-audio-card,bitclock-master = <&master>; + simple-audio-card,frame-master = <&master>; + simple-audio-card,widgets = + "Microphone", "Mic Jack", + "Line", "Line In Jack", + "Headphone", "Headphone Jack", + "Speaker", "Line Out Jack", + "Speaker", "Ext Spk"; + simple-audio-card,routing = + "MIC_IN", "Mic Jack", + "Mic Jack", "Mic Bias", "Headphone Jack", "HP_OUT"; - mux-int-port = <2>; - mux-ext-port = <5>; + + simple-audio-card,cpu { + sound-dai = <&ssi2>; + }; + + master: simple-audio-card,codec { + sound-dai = <&sgtl5000>; + }; }; leds {
@@ -112,8 +128,28 @@ &audmux { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_audmux>; /* SSI1 */ + pinctrl-0 = <&pinctrl_audmux>; status = "okay"; + + audmux_ssi1 { + fsl,audmux-port = <MX51_AUDMUX_PORT2_SSI1>; + fsl,port-config = < + (IMX_AUDMUX_V2_PTCR_TFSDIR | + IMX_AUDMUX_V2_PTCR_TFSEL(MX51_AUDMUX_PORT4) | + IMX_AUDMUX_V2_PTCR_TCLKDIR | + IMX_AUDMUX_V2_PTCR_TCSEL(MX51_AUDMUX_PORT4) | + IMX_AUDMUX_V2_PTCR_SYN) + IMX_AUDMUX_V2_PDCR_RXDSEL(MX51_AUDMUX_PORT4) + >; + }; + + audmux_aud4 { + fsl,audmux-port = <MX51_AUDMUX_PORT4>; + fsl,port-config = < + IMX_AUDMUX_V2_PTCR_SYN + IMX_AUDMUX_V2_PDCR_RXDSEL(MX51_AUDMUX_PORT2_SSI1) + >; + }; }; &esdhc2 {
@@ -131,6 +167,7 @@ status = "okay"; sgtl5000: codec at 0a { + #sound-dai-cells = <0>; compatible = "fsl,sgtl5000"; reg = <0x0a>; VDDA-supply = <®_3p3v>;
--
2.4.9