UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: dts: imx6qdl-icore-rqs: Switch to use simple-audio-card 

This patch replace fsl,imx-audio-sgtl5000 and use simple-audio-card
for Engicam i.CoreM6 RQS QDL platform boards.

This patch also fix, pinctrl_adumux.

Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
This commit is contained in:
Jagan Teki 2017-09-18 16:58:31 +05:30 committed by Shawn Guo
parent 4f0c2c754e
commit b5307edb16
2 changed files with 50 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi
View File

@ -41,6 +41,7 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/clock/imx6qdl-clock.h> #include <dt-bindings/clock/imx6qdl-clock.h>
#include <dt-bindings/sound/fsl-imx-audmux.h>
/ { / {
memory { memory {
@ -120,28 +121,61 @@
}; };
sound { sound {
compatible = "fsl,imx-audio-sgtl5000"; compatible = "simple-audio-card";
model = "imx-audio-sgtl5000"; simple-audio-card,name = "imx6qdl-icore-rqs-sgtl5000";
ssi-controller = <&ssi1>; simple-audio-card,format = "i2s";
audio-codec = <&sgtl5000>; simple-audio-card,bitclock-master = <&dailink_master>;
audio-routing = simple-audio-card,frame-master = <&dailink_master>;
simple-audio-card,widgets =
"Microphone", "Mic Jack",
"Headphone", "Headphone Jack",
"Line", "Line In Jack",
"Speaker", "Line Out Jack",
"Speaker", "Ext Spk";
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 = <4>;
};
};
&clks { simple-audio-card,cpu {
assigned-clocks = <&clks IMX6QDL_CLK_LVDS2_SEL>; sound-dai = <&ssi1>;
assigned-clock-parents = <&clks IMX6QDL_CLK_OSC>; };
dailink_master: simple-audio-card,codec {
sound-dai = <&sgtl5000>;
};
};
}; };
&audmux { &audmux {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_audmux>; pinctrl-0 = <&pinctrl_audmux>;
status = "okay"; status = "okay";
audmux_ssi1 {
fsl,audmux-port = <MX51_AUDMUX_PORT1_SSI0>;
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_PORT1_SSI0)
>;
};
};
&clks {
assigned-clocks = <&clks IMX6QDL_CLK_LVDS2_SEL>;
assigned-clock-parents = <&clks IMX6QDL_CLK_OSC>;
}; };
&fec { &fec {
@ -189,6 +223,7 @@
status = "okay"; status = "okay";
sgtl5000: codec@a { sgtl5000: codec@a {
#sound-dai-cells = <0>;
compatible = "fsl,sgtl5000"; compatible = "fsl,sgtl5000";
reg = <0x0a>; reg = <0x0a>;
clocks = <&clks IMX6QDL_CLK_CKO>; clocks = <&clks IMX6QDL_CLK_CKO>;
@ -206,6 +241,7 @@
}; };
&ssi1 { &ssi1 {
fsl,mode = "i2s-slave";
status = "okay"; status = "okay";
}; };

4
arch/arm/boot/dts/imx6qdl-icore.dtsi
View File

@ -269,8 +269,8 @@
pinctrl_audmux: audmux { pinctrl_audmux: audmux {
fsl,pins = < fsl,pins = <
MX6QDL_PAD_DISP0_DAT20__AUD4_TXC 0x130b0 MX6QDL_PAD_DISP0_DAT20__AUD4_TXC 0x130b0
MX6QDL_PAD_DISP0_DAT21__AUD4_TXD 0x110b0 MX6QDL_PAD_DISP0_DAT21__AUD4_TXD 0x110b0
MX6QDL_PAD_DISP0_DAT22__AUD4_TXFS 0x130b0 MX6QDL_PAD_DISP0_DAT22__AUD4_TXFS 0x130b0
MX6QDL_PAD_DISP0_DAT23__AUD4_RXD 0x130b0 MX6QDL_PAD_DISP0_DAT23__AUD4_RXD 0x130b0
>; >;
}; };