ARM: dts: imx6: Use the mux- prefix

According to Documentation/devicetree/bindings/sound/imx-audmux.yaml,
there must be a "mux-" prefix in the audmux port nodes.

Add the "mux-" prefix to avoid devicetree schema warnings.

Signed-off-by: Fabio Estevam <festevam@denx.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx6dl-qmx6.dtsi b/arch/arm/boot/dts/imx6dl-qmx6.dtsi
index 150d698..05fd8ff 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-qmx6.dtsi
+++ b/arch/arm/boot/dts/imx6dl-qmx6.dtsi
@@ -48,7 +48,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_audmux>;
 
-       audmux_ssi1 {
+       mux-ssi1 {
                fsl,audmux-port = <MX51_AUDMUX_PORT1_SSI0>;
                fsl,port-config = <
                        (IMX_AUDMUX_V2_PTCR_TFSDIR |
@@ -60,7 +60,7 @@
                >;
        };
 
-       audmux_aud6 {
+       mux-aud6 {
                fsl,audmux-port = <MX51_AUDMUX_PORT6>;
                fsl,port-config = <
                        IMX_AUDMUX_V2_PTCR_SYN

diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-cm-fx6.dts
index 1ad41c9..ffb3b8e 100644 (file)
--- a/arch/arm/boot/dts/imx6q-cm-fx6.dts
+++ b/arch/arm/boot/dts/imx6q-cm-fx6.dts
@@ -141,7 +141,7 @@
        pinctrl-0 = <&pinctrl_audmux>;
        status = "okay";
 
-       ssi2 {
+       mux-ssi2 {
                fsl,audmux-port = <1>;
                fsl,port-config = <
                        (IMX_AUDMUX_V2_PTCR_RCLKDIR |
@@ -152,7 +152,7 @@
                >;
        };
 
-       audmux4 {
+       mux-audmux4 {
                fsl,audmux-port = <3>;
                fsl,port-config = <
                        (IMX_AUDMUX_V2_PTCR_TFSDIR |

diff --git a/arch/arm/boot/dts/imx6q-display5.dtsi b/arch/arm/boot/dts/imx6q-display5.dtsi
index fef5d72..b88b8aa 100644 (file)
--- a/arch/arm/boot/dts/imx6q-display5.dtsi
+++ b/arch/arm/boot/dts/imx6q-display5.dtsi
@@ -147,7 +147,7 @@
        pinctrl-0 = <&pinctrl_audmux>;
        status = "okay";
 
-       ssi2 {
+       mux-ssi2 {
                fsl,audmux-port = <1>;
                fsl,port-config = <
                        (IMX_AUDMUX_V2_PTCR_SYN |
@@ -159,7 +159,7 @@
                >;
        };
 
-       aud6 {
+       mux-aud6 {
                fsl,audmux-port = <5>;
                fsl,port-config = <
                        (IMX_AUDMUX_V2_PTCR_RFSEL(8) |

diff --git a/arch/arm/boot/dts/imx6q-kp.dtsi b/arch/arm/boot/dts/imx6q-kp.dtsi
index 5e0ed55..091903f 100644 (file)
--- a/arch/arm/boot/dts/imx6q-kp.dtsi
+++ b/arch/arm/boot/dts/imx6q-kp.dtsi
@@ -135,7 +135,7 @@
        pinctrl-0 = <&pinctrl_audmux>;
        status = "okay";
 
-       ssi1 {
+       mux-ssi1 {
                fsl,audmux-port = <0>;
                fsl,port-config = <
                        (IMX_AUDMUX_V2_PTCR_SYN |
@@ -147,7 +147,7 @@
                >;
        };
 
-       aud3 {
+       mux-aud3 {
                fsl,audmux-port = <2>;
                fsl,port-config = <
                        IMX_AUDMUX_V2_PTCR_SYN

diff --git a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
index 6c487d4..f7ab7bb 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
@@ -187,7 +187,7 @@
        pinctrl-0 = <&pinctrl_audmux>; /* AUD4<->sgtl5000 */
        status = "okay";
 
-       ssi2 {
+       mux-ssi2 {
                fsl,audmux-port = <1>;
                fsl,port-config = <
                        (IMX_AUDMUX_V2_PTCR_TFSDIR |
@@ -199,7 +199,7 @@
                >;
        };
 
-       aud5 {
+       mux-aud5 {
                fsl,audmux-port = <4>;
                fsl,port-config = <
                        IMX_AUDMUX_V2_PTCR_SYN

diff --git a/arch/arm/boot/dts/imx6qdl-gw551x.dtsi b/arch/arm/boot/dts/imx6qdl-gw551x.dtsi
index 0fa4b8e..29960d1 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw551x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw551x.dtsi
@@ -171,7 +171,7 @@
        pinctrl-0 = <&pinctrl_audmux>; /* AUD5<->tda1997x */
        status = "okay";
 
-       ssi1 {
+       mux-ssi1 {
                fsl,audmux-port = <0>;
                fsl,port-config = <
                        (IMX_AUDMUX_V2_PTCR_TFSDIR |
@@ -183,7 +183,7 @@
                >;
        };
 
-       aud5 {
+       mux-aud5 {
                fsl,audmux-port = <4>;
                fsl,port-config = <
                        IMX_AUDMUX_V2_PTCR_SYN

diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
index 2ffb21d..bfade71 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
@@ -147,7 +147,7 @@
 &audmux {
        status = "okay";
 
-       ssi1 {
+       mux-ssi1 {
                fsl,audmux-port = <0>;
                fsl,port-config = <
                        (IMX_AUDMUX_V2_PTCR_SYN |
@@ -159,7 +159,7 @@
                >;
        };
 
-       pins5 {
+       mux-pins5 {
                fsl,audmux-port = <4>;
                fsl,port-config = <
                        IMX_AUDMUX_V2_PTCR_SYN

diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
index eb1ad28..0883ef9 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
@@ -179,7 +179,7 @@
 &audmux {
        status = "okay";
 
-       ssi1 {
+       mux-ssi1 {
                fsl,audmux-port = <0>;
                fsl,port-config = <
                        (IMX_AUDMUX_V2_PTCR_SYN |
@@ -191,7 +191,7 @@
                >;
        };
 
-       pins5 {
+       mux-pins5 {
                fsl,audmux-port = <4>;
                fsl,port-config = <
                        IMX_AUDMUX_V2_PTCR_SYN

diff --git a/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi b/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi
index ef3f88c..d339957 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi
@@ -118,7 +118,7 @@
        pinctrl-0 = <&pinctrl_audmux>;
        status = "okay";
 
-       audmux_ssi1 {
+       mux-ssi1 {
                fsl,audmux-port = <MX51_AUDMUX_PORT1_SSI0>;
                fsl,port-config = <
                        (IMX_AUDMUX_V2_PTCR_TFSDIR |
@@ -130,7 +130,7 @@
                >;
        };
 
-       audmux_aud4 {
+       mux-aud4 {
                fsl,audmux-port = <MX51_AUDMUX_PORT4>;
                fsl,port-config = <
                        IMX_AUDMUX_V2_PTCR_SYN

diff --git a/arch/arm/boot/dts/imx6qdl-icore.dtsi b/arch/arm/boot/dts/imx6qdl-icore.dtsi
index 23c318d..efe1152 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-icore.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-icore.dtsi
@@ -109,7 +109,7 @@
        status = "okay";
 
 
-       audmux_ssi1 {
+       mux-ssi1 {
                fsl,audmux-port = <MX51_AUDMUX_PORT1_SSI0>;
                fsl,port-config = <
                        (IMX_AUDMUX_V2_PTCR_TFSDIR |
@@ -121,7 +121,7 @@
                >;
        };
 
-       audmux_aud4 {
+       mux-aud4 {
                fsl,audmux-port = <MX51_AUDMUX_PORT4>;
                fsl,port-config = <
                        IMX_AUDMUX_V2_PTCR_SYN

diff --git a/arch/arm/boot/dts/imx6qdl-mba6.dtsi b/arch/arm/boot/dts/imx6qdl-mba6.dtsi
index 34d5cf7..212c623 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-mba6.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-mba6.dtsi
@@ -129,7 +129,7 @@
 &audmux {
        status = "okay";
 
-       ssi0 {
+       mux-ssi0 {
                fsl,audmux-port = <MX31_AUDMUX_PORT1_SSI0>;
                fsl,port-config = <
                        (IMX_AUDMUX_V2_PTCR_SYN |
@@ -141,7 +141,7 @@
                >;
        };
 
-       aud3 {
+       mux-aud3 {
                fsl,audmux-port = <MX31_AUDMUX_PORT3_SSI_PINS_3>;
                fsl,port-config = <
                        IMX_AUDMUX_V2_PTCR_SYN

diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
index 51d28e2..a41e47c 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
@@ -75,7 +75,7 @@
 &audmux {
        status = "okay";
 
-       ssi2 {
+       mux-ssi2 {
                fsl,audmux-port = <1>;
                fsl,port-config = <
                        (IMX_AUDMUX_V2_PTCR_SYN |
@@ -87,7 +87,7 @@
                >;
        };
 
-       pins5 {
+       mux-pins5 {
                fsl,audmux-port = <4>;
                fsl,port-config = <
                        IMX_AUDMUX_V2_PTCR_SYN

diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
index a197bac..e2fe337 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
@@ -216,7 +216,7 @@
 &audmux {
        status = "okay";
 
-       ssi1 {
+       mux-ssi1 {
                fsl,audmux-port = <0>;
                fsl,port-config = <
                        (IMX_AUDMUX_V2_PTCR_SYN |
@@ -228,7 +228,7 @@
                >;
        };
 
-       pins5 {
+       mux-pins5 {
                fsl,audmux-port = <4>;
                fsl,port-config = <
                        IMX_AUDMUX_V2_PTCR_SYN

diff --git a/arch/arm/boot/dts/imx6qdl-var-dart.dtsi b/arch/arm/boot/dts/imx6qdl-var-dart.dtsi
index c41cac5..200559d 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-var-dart.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-var-dart.dtsi
@@ -39,7 +39,7 @@
        pinctrl-0 = <&pinctrl_audmux>;
        status = "okay";
 
-       ssi2 {
+       mux-ssi2 {
                fsl,audmux-port = <1>;
                fsl,port-config = <
                        (IMX_AUDMUX_V2_PTCR_SYN |
@@ -51,7 +51,7 @@
                >;
        };
 
-       aud3 {
+       mux-aud3 {
                fsl,audmux-port = <2>;
                fsl,port-config = <
                        IMX_AUDMUX_V2_PTCR_SYN

diff --git a/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi b/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi
index abd72d7..9ff183e 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi
@@ -848,7 +848,7 @@
        pinctrl-0 = <&pinctrl_audmux>;
        status = "okay";
 
-       ssi1 {
+       mux-ssi1 {
                fsl,audmux-port = <0>;
                fsl,port-config = <
                        (IMX_AUDMUX_V2_PTCR_SYN |
@@ -860,7 +860,7 @@
                >;
        };
 
-       aud3 {
+       mux-aud3 {
                fsl,audmux-port = <2>;
                fsl,port-config = <
                        IMX_AUDMUX_V2_PTCR_SYN
@@ -868,7 +868,7 @@
                >;
        };
 
-       ssi2 {
+       mux-ssi2 {
                fsl,audmux-port = <1>;
                fsl,port-config = <
                        (IMX_AUDMUX_V2_PTCR_SYN |
@@ -880,7 +880,7 @@
                >;
        };
 
-       aud5 {
+       mux-aud5 {
                fsl,audmux-port = <4>;
                fsl,port-config = <
                        IMX_AUDMUX_V2_PTCR_SYN