[PATCH 1/2] ARM: dts: mx5: Fix IPU port node placement

[PATCH 1/2] ARM: dts: mx5: Fix IPU port node placement

[Marek Vasut]

The "port" node was misplaced in the original patch, therefore making
the LCD dysfunctional on this board. Fix this by moving the "port" DT
node into the "display {}" node.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
---
 arch/arm/boot/dts/imx53-m53evk.dts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/imx53-m53evk.dts b/arch/arm/boot/dts/imx53-m53evk.dts
index d5d146a..3a04b9e 100644
--- a/arch/arm/boot/dts/imx53-m53evk.dts
+++ b/arch/arm/boot/dts/imx53-m53evk.dts
@@ -43,11 +43,11 @@
 					vsync-active = <1>;
 				};
 			};
-		};
 
-		port {
-			display1_in: endpoint {
-				remote-endpoint = <&ipu_di1_disp1>;
+			port {
+				display1_in: endpoint {
+					remote-endpoint = <&ipu_di1_disp1>;
+				};
 			};
 		};
 	};
-- 
2.0.0.rc2

[PATCH 2/2] ARM: dts: mx5: Move the display out of soc {} node

[Marek Vasut]

Move the display {} node out of the soc {} node . This just aligns
the DT with other boards, there is no functional change.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/boot/dts/imx53-m53evk.dts | 48 ++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/arch/arm/boot/dts/imx53-m53evk.dts b/arch/arm/boot/dts/imx53-m53evk.dts
index 3a04b9e..c4956b0 100644
--- a/arch/arm/boot/dts/imx53-m53evk.dts
+++ b/arch/arm/boot/dts/imx53-m53evk.dts
@@ -21,33 +21,31 @@
 		      <0xb0000000 0x20000000>;
 	};
 
-	soc {
-		display1: display at di1 {
-			compatible = "fsl,imx-parallel-display";
-			interface-pix-fmt = "bgr666";
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_ipu_disp1>;
-
-			display-timings {
-				800x480p60 {
-					native-mode;
-					clock-frequency = <31500000>;
-					hactive = <800>;
-					vactive = <480>;
-					hfront-porch = <40>;
-					hback-porch = <88>;
-					hsync-len = <128>;
-					vback-porch = <33>;
-					vfront-porch = <9>;
-					vsync-len = <3>;
-					vsync-active = <1>;
-				};
+	display1: display at di1 {
+		compatible = "fsl,imx-parallel-display";
+		interface-pix-fmt = "bgr666";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_ipu_disp1>;
+
+		display-timings {
+			800x480p60 {
+				native-mode;
+				clock-frequency = <31500000>;
+				hactive = <800>;
+				vactive = <480>;
+				hfront-porch = <40>;
+				hback-porch = <88>;
+				hsync-len = <128>;
+				vback-porch = <33>;
+				vfront-porch = <9>;
+				vsync-len = <3>;
+				vsync-active = <1>;
 			};
+		};
 
-			port {
-				display1_in: endpoint {
-					remote-endpoint = <&ipu_di1_disp1>;
-				};
+		port {
+			display1_in: endpoint {
+				remote-endpoint = <&ipu_di1_disp1>;
 			};
 		};
 	};
-- 
2.0.0.rc2

[PATCH 1/2] ARM: dts: mx5: Fix IPU port node placement

[Philipp Zabel]

Am Freitag, den 13.06.2014, 02:22 +0200 schrieb Marek Vasut:
> The "port" node was misplaced in the original patch, therefore making
> the LCD dysfunctional on this board. Fix this by moving the "port" DT
> node into the "display {}" node.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Shawn Guo <shawn.guo@linaro.org>
> Cc: Philipp Zabel <p.zabel@pengutronix.de>

Acked-by: Philipp Zabel <p.zabel@pengutronix.de>

thanks
Philipp

[PATCH 1/2] ARM: dts: mx5: Fix IPU port node placement

[Shawn Guo]

On Fri, Jun 13, 2014 at 02:22:39AM +0200, Marek Vasut wrote:
> The "port" node was misplaced in the original patch, therefore making
> the LCD dysfunctional on this board. Fix this by moving the "port" DT
> node into the "display {}" node.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>

Applied both, thanks.