From 28eba7d2cc32c423da6d0e5d5b0e6499e9a8d3d0 Mon Sep 17 00:00:00 2001 From: Sandor Yu Date: Fri, 28 Aug 2015 18:05:53 +0800 Subject: MLK-11431-4: ARM: DTS: imx: Update IPU and display property Update IPU and display property, make sure these dts files can pass build. Signed-off-by: Sandor Yu --- arch/arm/boot/dts/imx6dl-aristainetos_4.dts | 48 ++++++++--------------------- 1 file changed, 13 insertions(+), 35 deletions(-) (limited to 'arch/arm/boot/dts/imx6dl-aristainetos_4.dts') diff --git a/arch/arm/boot/dts/imx6dl-aristainetos_4.dts b/arch/arm/boot/dts/imx6dl-aristainetos_4.dts index d4c4a22db488..926e4ee13c1e 100644 --- a/arch/arm/boot/dts/imx6dl-aristainetos_4.dts +++ b/arch/arm/boot/dts/imx6dl-aristainetos_4.dts @@ -3,6 +3,8 @@ * * Copyright (C) 2014 Heiko Schocher * + * Copyright 2015 Freescale Semiconductor, Inc. All Rights Reserved. + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. @@ -30,39 +32,19 @@ memory { reg = <0x10000000 0x40000000>; }; +}; - soc { - display0: display@di0 { - compatible = "fsl,imx-parallel-display"; - interface-pix-fmt = "rgb24"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_ipu_disp>; - status = "okay"; - - display-timings { - 480x800p60 { - native-mode; - clock-frequency = <30000000>; - hactive = <480>; - vactive = <800>; - hfront-porch = <59>; - hback-porch = <10>; - hsync-len = <10>; - vback-porch = <15>; - vfront-porch = <15>; - vsync-len = <15>; - hsync-active = <1>; - vsync-active = <1>; - }; - }; +&mxcfb1 { + status = "okay"; +}; - port { - display0_in: endpoint { - remote-endpoint = <&ipu1_di0_disp0>; - }; - }; - }; - }; +&lcd { + ipu_id = <0>; + disp_id = <0>; + default_ifmt = "RGB24"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu_disp>; + status = "okay"; }; &ecspi2 { @@ -80,10 +62,6 @@ status = "okay"; }; -&ipu1_di0_disp0 { - remote-endpoint = <&display0_in>; -}; - &pwm1 { status = "okay"; }; -- cgit v1.2.3