Commit 3f8b6cf8 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Shawn Guo
Browse files

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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 473d06b9

arch/arm/boot/dts/imx7s-warp.dts

+7 −6
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ &mipi_csi { 
	clock-frequency = <166000000>;

	status = "okay";



	ports {

		port@0 {

			reg = <0>;
@@ -257,7 +258,7 @@ mipi_from_sensor: endpoint { 
				remote-endpoint = <&ov2680_to_mipi>;

				data-lanes = <1>;

			};



		};

	};

};

arch/arm/boot/dts/imx7s.dtsi

+12 −9
Original line number Diff line number Diff line
@@ -809,8 +809,6 @@ lcdif: lcdif@30730000 { 
			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,6 +819,10 @@ mipi_csi: mipi-csi@30750000 { 
				resets = <&src IMX7_RESET_MIPI_PHY_MRST>;

				status = "disabled";



				ports {

					#address-cells = <1>;

					#size-cells = <0>;



					port@0 {

						reg = <0>;

					};
@@ -834,6 +836,7 @@ mipi_vc0_to_csi_mux: endpoint { 
					};

				};

			};

		};



		aips3: bus@30800000 {

			compatible = "fsl,aips-bus", "simple-bus";