Commit 9eb0e5f9 authored by Markus Pargmann's avatar Markus Pargmann Committed by Shawn Guo

ARM: dts: imx: remove ssi fsl,mode for audio cards

The DAI mode is and should be configured by the sound card driver as
codec and ssi have to be in the right modes to communicate with each
other. It is possible to operate the ssi unit or the codec in master mode,
sometimes even on the same board in different configurations.

With the latest changes in the fsl-ssi driver, the 'fsl,mode' property
is only handled as a fallback property. If the sound card sets the DAI
mode correctly, this fallback configuration is dropped.
Signed-off-by: default avatarMarkus Pargmann <mpa@pengutronix.de>
Signed-off-by: default avatarShawn Guo <shawn.guo@freescale.com>
parent 6562c587
...@@ -155,7 +155,6 @@ MX25_PAD_UART2_CTS__UART2_CTS 0x80000000 ...@@ -155,7 +155,6 @@ MX25_PAD_UART2_CTS__UART2_CTS 0x80000000
&ssi1 { &ssi1 {
codec-handle = <&tlv320aic23>; codec-handle = <&tlv320aic23>;
fsl,mode = "i2s-slave";
status = "okay"; status = "okay";
}; };
......
...@@ -233,7 +233,6 @@ MATRIX_KEY(0x3, 0x2, KEY_POWER) ...@@ -233,7 +233,6 @@ MATRIX_KEY(0x3, 0x2, KEY_POWER)
&ssi1 { &ssi1 {
codec-handle = <&codec>; codec-handle = <&codec>;
fsl,mode = "i2s-slave";
status = "okay"; status = "okay";
}; };
......
...@@ -135,7 +135,6 @@ &sdhci1 { ...@@ -135,7 +135,6 @@ &sdhci1 {
&ssi1 { &ssi1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ssi1>; pinctrl-0 = <&pinctrl_ssi1>;
fsl,mode = "i2s-slave";
codec-handle = <&codec>; codec-handle = <&codec>;
status = "okay"; status = "okay";
}; };
......
...@@ -310,7 +310,6 @@ &nfc { ...@@ -310,7 +310,6 @@ &nfc {
&ssi1 { &ssi1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ssi1>; pinctrl-0 = <&pinctrl_ssi1>;
fsl,mode = "i2s-slave";
status = "okay"; status = "okay";
}; };
......
...@@ -133,7 +133,6 @@ MX35_PAD_CTS2__UART2_CTS 0x1c5 ...@@ -133,7 +133,6 @@ MX35_PAD_CTS2__UART2_CTS 0x1c5
&ssi1 { &ssi1 {
codec-handle = <&tlv320aic23>; codec-handle = <&tlv320aic23>;
fsl,mode = "i2s-slave";
status = "okay"; status = "okay";
}; };
......
...@@ -393,7 +393,6 @@ MATRIX_KEY(3, 3, KEY_POWER) ...@@ -393,7 +393,6 @@ MATRIX_KEY(3, 3, KEY_POWER)
}; };
&ssi2 { &ssi2 {
fsl,mode = "i2s-slave";
status = "okay"; status = "okay";
}; };
......
...@@ -255,7 +255,6 @@ MX51_PAD_EIM_CS3__GPIO2_28 0x1f5 ...@@ -255,7 +255,6 @@ MX51_PAD_EIM_CS3__GPIO2_28 0x1f5
&ssi2 { &ssi2 {
codec-handle = <&tlv320aic23>; codec-handle = <&tlv320aic23>;
fsl,mode = "i2s-slave";
status = "okay"; status = "okay";
}; };
......
...@@ -427,7 +427,6 @@ &sata { ...@@ -427,7 +427,6 @@ &sata {
}; };
&ssi2 { &ssi2 {
fsl,mode = "i2s-slave";
status = "okay"; status = "okay";
}; };
......
...@@ -225,7 +225,6 @@ &uart1 { ...@@ -225,7 +225,6 @@ &uart1 {
}; };
&ssi2 { &ssi2 {
fsl,mode = "i2s-slave";
status = "okay"; status = "okay";
}; };
......
...@@ -141,7 +141,6 @@ &ipu_di0_disp0 { ...@@ -141,7 +141,6 @@ &ipu_di0_disp0 {
}; };
&ssi2 { &ssi2 {
fsl,mode = "i2s-slave";
status = "okay"; status = "okay";
}; };
......
...@@ -502,7 +502,6 @@ &sdma { ...@@ -502,7 +502,6 @@ &sdma {
}; };
&ssi1 { &ssi1 {
fsl,mode = "i2s-slave";
codec-handle = <&sgtl5000>; codec-handle = <&sgtl5000>;
status = "okay"; status = "okay";
}; };
......
...@@ -154,6 +154,5 @@ &kpp { ...@@ -154,6 +154,5 @@ &kpp {
}; };
&ssi2 { &ssi2 {
fsl,mode = "i2s-slave";
status = "okay"; status = "okay";
}; };
...@@ -254,7 +254,6 @@ &pwm4 { ...@@ -254,7 +254,6 @@ &pwm4 {
}; };
&ssi1 { &ssi1 {
fsl,mode = "i2s-slave";
status = "okay"; status = "okay";
}; };
......
...@@ -504,7 +504,6 @@ eth1: sky2@8 { /* MAC/PHY on bus 8 */ ...@@ -504,7 +504,6 @@ eth1: sky2@8 { /* MAC/PHY on bus 8 */
}; };
&ssi1 { &ssi1 {
fsl,mode = "i2s-slave";
status = "okay"; status = "okay";
}; };
......
...@@ -489,7 +489,6 @@ &pwm4 { ...@@ -489,7 +489,6 @@ &pwm4 {
}; };
&ssi1 { &ssi1 {
fsl,mode = "i2s-slave";
status = "okay"; status = "okay";
}; };
......
...@@ -533,7 +533,6 @@ &pwm4 { ...@@ -533,7 +533,6 @@ &pwm4 {
}; };
&ssi1 { &ssi1 {
fsl,mode = "i2s-slave";
status = "okay"; status = "okay";
}; };
......
...@@ -555,12 +555,10 @@ &pwm4 { ...@@ -555,12 +555,10 @@ &pwm4 {
}; };
&ssi1 { &ssi1 {
fsl,mode = "i2s-slave";
status = "okay"; status = "okay";
}; };
&ssi2 { &ssi2 {
fsl,mode = "i2s-slave";
status = "okay"; status = "okay";
}; };
......
...@@ -381,7 +381,6 @@ &pwm4 { ...@@ -381,7 +381,6 @@ &pwm4 {
}; };
&ssi1 { &ssi1 {
fsl,mode = "i2s-slave";
status = "okay"; status = "okay";
}; };
......
...@@ -381,7 +381,6 @@ &pwm4 { ...@@ -381,7 +381,6 @@ &pwm4 {
}; };
&ssi1 { &ssi1 {
fsl,mode = "i2s-slave";
status = "okay"; status = "okay";
}; };
......
...@@ -513,7 +513,6 @@ &pwm1 { ...@@ -513,7 +513,6 @@ &pwm1 {
}; };
&ssi2 { &ssi2 {
fsl,mode = "i2s-slave";
status = "okay"; status = "okay";
}; };
......
...@@ -637,7 +637,6 @@ &pwm2 { ...@@ -637,7 +637,6 @@ &pwm2 {
}; };
&ssi1 { &ssi1 {
fsl,mode = "i2s-slave";
status = "okay"; status = "okay";
}; };
......
...@@ -233,7 +233,6 @@ &spdif { ...@@ -233,7 +233,6 @@ &spdif {
}; };
&ssi1 { &ssi1 {
fsl,mode = "i2s-slave";
status = "okay"; status = "okay";
}; };
......
...@@ -489,7 +489,6 @@ MATRIX_KEY(0x2, 0x1, KEY_VOLUMEUP) /* ROW2, COL1 */ ...@@ -489,7 +489,6 @@ MATRIX_KEY(0x2, 0x1, KEY_VOLUMEUP) /* ROW2, COL1 */
}; };
&ssi2 { &ssi2 {
fsl,mode = "i2s-slave";
status = "okay"; status = "okay";
}; };
......
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