ARM: dts: imx6: fix dtc warnings for ipu endpoints

When compiled with "W=1", dtc complains: e.g.
"Warning (unit_address_vs_reg):
Node /soc/ipu@02800000/port@2/endpoint@0
has a unit name, but no reg property"

Endpoint nodes don't have a reg property, and the addresses
in their node names are ordinals without any special meaning
so remove them and swap them for semantic node names.

Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index cd10c8de19048fd0e2217ddce1a286248f8010e9..c30c8368cae0c2adefe3a31da59bba241280bc9d 100644 (file)
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -154,22 +154,22 @@
                                #size-cells = <0>;
                                reg = <2>;
 
-                               ipu2_di0_disp0: endpoint@0 {
+                               ipu2_di0_disp0: disp0-endpoint {
                                };
 
-                               ipu2_di0_hdmi: endpoint@1 {
+                               ipu2_di0_hdmi: hdmi-endpoint {
                                        remote-endpoint = <&hdmi_mux_2>;
                                };
 
-                               ipu2_di0_mipi: endpoint@2 {
+                               ipu2_di0_mipi: mipi-endpoint {
                                        remote-endpoint = <&mipi_mux_2>;
                                };
 
-                               ipu2_di0_lvds0: endpoint@3 {
+                               ipu2_di0_lvds0: lvds0-endpoint {
                                        remote-endpoint = <&lvds0_mux_2>;
                                };
 
-                               ipu2_di0_lvds1: endpoint@4 {
+                               ipu2_di0_lvds1: lvds1-endpoint {
                                        remote-endpoint = <&lvds1_mux_2>;
                                };
                        };
@@ -179,19 +179,19 @@
                                #size-cells = <0>;
                                reg = <3>;
 
-                               ipu2_di1_hdmi: endpoint@1 {
+                               ipu2_di1_hdmi: hdmi-endpoint {
                                        remote-endpoint = <&hdmi_mux_3>;
                                };
 
-                               ipu2_di1_mipi: endpoint@2 {
+                               ipu2_di1_mipi: mipi-endpoint {
                                        remote-endpoint = <&mipi_mux_3>;
                                };
 
-                               ipu2_di1_lvds0: endpoint@3 {
+                               ipu2_di1_lvds0: lvds0-endpoint {
                                        remote-endpoint = <&lvds0_mux_3>;
                                };
 
-                               ipu2_di1_lvds1: endpoint@4 {
+                               ipu2_di1_lvds1: lvds1-endpoint {
                                        remote-endpoint = <&lvds1_mux_3>;
                                };
                        };

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index b42822aa14f29e7d1547e469c4a82218e65c5d44..294afa7734b7079ffeb4595b0d67d97360fefedc 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -1230,22 +1230,22 @@
                                #size-cells = <0>;
                                reg = <2>;
 
-                               ipu1_di0_disp0: endpoint@0 {
+                               ipu1_di0_disp0: disp0-endpoint {
                                };
 
-                               ipu1_di0_hdmi: endpoint@1 {
+                               ipu1_di0_hdmi: hdmi-endpoint {
                                        remote-endpoint = <&hdmi_mux_0>;
                                };
 
-                               ipu1_di0_mipi: endpoint@2 {
+                               ipu1_di0_mipi: mipi-endpoint {
                                        remote-endpoint = <&mipi_mux_0>;
                                };
 
-                               ipu1_di0_lvds0: endpoint@3 {
+                               ipu1_di0_lvds0: lvds0-endpoint {
                                        remote-endpoint = <&lvds0_mux_0>;
                                };
 
-                               ipu1_di0_lvds1: endpoint@4 {
+                               ipu1_di0_lvds1: lvds1-endpoint {
                                        remote-endpoint = <&lvds1_mux_0>;
                                };
                        };
@@ -1255,22 +1255,22 @@
                                #size-cells = <0>;
                                reg = <3>;
 
-                               ipu1_di0_disp1: endpoint@0 {
+                               ipu1_di0_disp1: disp1-endpoint {
                                };
 
-                               ipu1_di1_hdmi: endpoint@1 {
+                               ipu1_di1_hdmi: hdmi-endpoint {
                                        remote-endpoint = <&hdmi_mux_1>;
                                };
 
-                               ipu1_di1_mipi: endpoint@2 {
+                               ipu1_di1_mipi: mipi-endpoint {
                                        remote-endpoint = <&mipi_mux_1>;
                                };
 
-                               ipu1_di1_lvds0: endpoint@3 {
+                               ipu1_di1_lvds0: lvds0-endpoint {
                                        remote-endpoint = <&lvds0_mux_1>;
                                };
 
-                               ipu1_di1_lvds1: endpoint@4 {
+                               ipu1_di1_lvds1: lvds1-endpoint {
                                        remote-endpoint = <&lvds1_mux_1>;
                                };
                        };