Commit 1a0f710e authored by Lothar Waßmann's avatar Lothar Waßmann Committed by Shawn Guo

ARM: dts: imx6-tx6: convert to using simple-audio-card

Convert the DTS sound setup to use the simple-audio-card driver.
Signed-off-by: default avatarLothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 9b2d8405
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pwm/pwm.h> #include <dt-bindings/pwm/pwm.h>
#include <dt-bindings/sound/fsl-imx-audmux.h>
/ { / {
aliases { aliases {
...@@ -183,24 +184,56 @@ reg_usbotg_vbus: regulator-usbotg-vbus { ...@@ -183,24 +184,56 @@ reg_usbotg_vbus: regulator-usbotg-vbus {
}; };
sound { sound {
compatible = "karo,imx6qdl-tx6qdl-sgtl5000", compatible = "karo,imx6qdl-tx6-sgtl5000",
"fsl,imx-audio-sgtl5000"; "simple-audio-card";
model = "sgtl5000-audio"; simple-audio-card,name = "imx6qdl-tx6-sgtl5000-audio";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_audmux>; pinctrl-0 = <&pinctrl_audmux>;
ssi-controller = <&ssi1>; simple-audio-card,format = "i2s";
audio-codec = <&sgtl5000>; simple-audio-card,bitclock-master = <&codec_dai>;
audio-routing = simple-audio-card,frame-master = <&codec_dai>;
simple-audio-card,widgets =
"Microphone", "Mic Jack",
"Line", "Line In",
"Line", "Line Out",
"Headphone", "Headphone Jack";
simple-audio-card,routing =
"MIC_IN", "Mic Jack", "MIC_IN", "Mic Jack",
"Mic Jack", "Mic Bias", "Mic Jack", "Mic Bias",
"Headphone Jack", "HP_OUT"; "Headphone Jack", "HP_OUT";
mux-int-port = <1>;
mux-ext-port = <5>; cpu_dai: simple-audio-card,cpu {
sound-dai = <&ssi1>;
};
codec_dai: simple-audio-card,codec {
sound-dai = <&sgtl5000>;
};
}; };
}; };
&audmux { &audmux {
status = "okay"; status = "okay";
ssi1 {
fsl,audmux-port = <0>;
fsl,port-config = <
(IMX_AUDMUX_V2_PTCR_SYN |
IMX_AUDMUX_V2_PTCR_TFSEL(4) |
IMX_AUDMUX_V2_PTCR_TCSEL(4) |
IMX_AUDMUX_V2_PTCR_TFSDIR |
IMX_AUDMUX_V2_PTCR_TCLKDIR)
IMX_AUDMUX_V2_PDCR_RXDSEL(4)
>;
};
pins5 {
fsl,audmux-port = <4>;
fsl,port-config = <
IMX_AUDMUX_V2_PTCR_SYN
IMX_AUDMUX_V2_PDCR_RXDSEL(0)
>;
};
}; };
&can1 { &can1 {
...@@ -299,6 +332,7 @@ &i2c3 { ...@@ -299,6 +332,7 @@ &i2c3 {
sgtl5000: sgtl5000@0a { sgtl5000: sgtl5000@0a {
compatible = "fsl,sgtl5000"; compatible = "fsl,sgtl5000";
#sound-dai-cells = <0>;
reg = <0x0a>; reg = <0x0a>;
VDDA-supply = <&reg_2v5>; VDDA-supply = <&reg_2v5>;
VDDIO-supply = <&reg_3v3>; VDDIO-supply = <&reg_3v3>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment