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 150d69858255d32e19203604b893d61bfea78ebd..05fd8ff4da1ee98456689ef08f0e8b2f8225541c 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 1ad41c944b4b9cc4d1449ce623d15bb5ef00fc38..ffb3b8eeae5dba5713de7e5c4e683bc6b1743bf9 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 fef5d72545365c7479ad026cde49a6ddff191473..b88b8aa730d7637fe0db24daef1f0428a41c2ffd 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 5e0ed556004058da72cd6f2931b540e65d09317c..091903f53a56097c40f103600e5ddc2bdabb923c 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 6c487d40a3b767e46c61f5f97bbf40d9865571de..f7ab7bbcc56072f59c90ca26ccd794f2957602d1 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 0fa4b8eeddee75870ccdf653d370ad33f8196dc1..29960d1cf6a03f260e92e7d1a11f34d6c24a3a1e 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 2ffb21dd89f2af578524151949a8e526e88ceaeb..bfade71490807a955882d8c35dc5bffbbdee8086 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 eb1ad28946d3652f664c8154c9a71ae3fcc4cb7b..0883ef99cded09b219ae81cbb0b68eb97e48df8c 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 ef3f88c3615fdb355a6b135eca18174213c1c09d..d339957cc09730297bbf3b672985dbd070f5493b 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 23c318d9636fcd895e6c6fcdb56934d3a758dbc0..efe11524b885db38ffa295d0e4465611114702bf 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 34d5cf7cee0b18dd156404a00d08a2a1387cfc62..212c623418fc42faa5cf551c995d1e57b5882fb1 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 51d28e275aa649ba878dc972b281b55ab0d07176..a41e47c06ef40ccee5276ea7e4be17e3a30c127e 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 a197bac95cbace8b32c5bbbd298fb256302f24c7..e2fe337f7d9ed6eae042516d8db1665764768470 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 c41cac502bacc30ced5a402de990944a8e404a21..200559d7158dc0b7c507471f02895a20d2ce6d1c 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 abd72d72ae996e95c03c4b06fb6371e9241f84c0..9ff183e4e069a805adad0d95485713167acd72ba 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