ARM: dts: imx7: Group mipi_csi 'port' children in a 'ports' node

The nxp,imx7-mipi-csi2.yaml binding requires ports to be grouped in a
ports node, as multiple ports are present. Fix imx7s.dtsi and the only
board file that references the mipi_csi ports.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx7s-warp.dts b/arch/arm/boot/dts/imx7s-warp.dts
index 614d252..4f1edef 100644 (file)
--- a/arch/arm/boot/dts/imx7s-warp.dts
+++ b/arch/arm/boot/dts/imx7s-warp.dts
@@ -250,14 +250,15 @@
        clock-frequency = <166000000>;
        status = "okay";
 
-       port@0 {
-               reg = <0>;
+       ports {
+               port@0 {
+                       reg = <0>;
 
-               mipi_from_sensor: endpoint {
-                       remote-endpoint = <&ov2680_to_mipi>;
-                       data-lanes = <1>;
+                       mipi_from_sensor: endpoint {
+                               remote-endpoint = <&ov2680_to_mipi>;
+                               data-lanes = <1>;
+                       };
                };
-
        };
 };
 

diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 7e6b99e..52a9aee 100644 (file)
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -809,8 +809,6 @@
                        mipi_csi: mipi-csi@30750000 {
                                compatible = "fsl,imx7-mipi-csi2";
                                reg = <0x30750000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
                                interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX7D_IPG_ROOT_CLK>,
                                         <&clks IMX7D_MIPI_CSI_ROOT_CLK>,
@@ -821,15 +819,20 @@
                                resets = <&src IMX7_RESET_MIPI_PHY_MRST>;
                                status = "disabled";
 
-                               port@0 {
-                                       reg = <0>;
-                               };
+                               ports {
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
 
-                               port@1 {
-                                       reg = <1>;
+                                       port@0 {
+                                               reg = <0>;
+                                       };
 
-                                       mipi_vc0_to_csi_mux: endpoint {
-                                               remote-endpoint = <&csi_mux_from_mipi_vc0>;
+                                       port@1 {
+                                               reg = <1>;
+
+                                               mipi_vc0_to_csi_mux: endpoint {
+                                                       remote-endpoint = <&csi_mux_from_mipi_vc0>;
+                                               };
                                        };
                                };
                        };