Merge tag 'microblaze-4.16-rc1' of git://git.monstr.eu/linux-2.6-microblaze

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx6dl.dtsi

diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index 4d693a75ce98b99ba7d9c1ec57f13b4361ddba39..c01674fa098aa48280cf52be9899795ad0a014be 100644 (file)
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -170,7 +170,7 @@
 };
 
 &gpr {
-       ipu1_csi0_mux: ipu1_csi0_mux@34 {
+       ipu1_csi0_mux {
                compatible = "video-mux";
                mux-controls = <&mux 0>;
                #address-cells = <1>;
@@ -224,7 +224,7 @@
                };
        };
 
-       ipu1_csi1_mux: ipu1_csi1_mux@34 {
+       ipu1_csi1_mux {
                compatible = "video-mux";
                mux-controls = <&mux 1>;
                #address-cells = <1>;
@@ -309,10 +309,12 @@
                #size-cells = <0>;
 
                mipi_vc0_to_ipu1_csi0_mux: endpoint@0 {
+                       reg = <0>;
                        remote-endpoint = <&ipu1_csi0_mux_from_mipi_vc0>;
                };
 
                mipi_vc0_to_ipu1_csi1_mux: endpoint@1 {
+                       reg = <1>;
                        remote-endpoint = <&ipu1_csi1_mux_from_mipi_vc0>;
                };
        };
@@ -323,10 +325,12 @@
                #size-cells = <0>;
 
                mipi_vc1_to_ipu1_csi0_mux: endpoint@0 {
+                       reg = <0>;
                        remote-endpoint = <&ipu1_csi0_mux_from_mipi_vc1>;
                };
 
                mipi_vc1_to_ipu1_csi1_mux: endpoint@1 {
+                       reg = <1>;
                        remote-endpoint = <&ipu1_csi1_mux_from_mipi_vc1>;
                };
        };
@@ -337,10 +341,12 @@
                #size-cells = <0>;
 
                mipi_vc2_to_ipu1_csi0_mux: endpoint@0 {
+                       reg = <0>;
                        remote-endpoint = <&ipu1_csi0_mux_from_mipi_vc2>;
                };
 
                mipi_vc2_to_ipu1_csi1_mux: endpoint@1 {
+                       reg = <1>;
                        remote-endpoint = <&ipu1_csi1_mux_from_mipi_vc2>;
                };
        };
@@ -351,10 +357,12 @@
                #size-cells = <0>;
 
                mipi_vc3_to_ipu1_csi0_mux: endpoint@0 {
+                       reg = <0>;
                        remote-endpoint = <&ipu1_csi0_mux_from_mipi_vc3>;
                };
 
                mipi_vc3_to_ipu1_csi1_mux: endpoint@1 {
+                       reg = <1>;
                        remote-endpoint = <&ipu1_csi1_mux_from_mipi_vc3>;
                };
        };