summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx6dl-aristainetos_4.dts
diff options
context:
space:
mode:
authorSandor Yu <R01008@freescale.com>2015-08-28 18:05:53 +0800
committerNitin Garg <nitin.garg@nxp.com>2016-01-14 11:01:22 -0600
commit28eba7d2cc32c423da6d0e5d5b0e6499e9a8d3d0 (patch)
tree21b2b944a5705f70c248830d47a7019315319962 /arch/arm/boot/dts/imx6dl-aristainetos_4.dts
parentdc7fee5c4476eafd8a3add48b90b56d44bd4fa24 (diff)
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 <R01008@freescale.com>
Diffstat (limited to 'arch/arm/boot/dts/imx6dl-aristainetos_4.dts')
-rw-r--r--arch/arm/boot/dts/imx6dl-aristainetos_4.dts48
1 files changed, 13 insertions, 35 deletions
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 <hs@denx.de>
*
+ * 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";
};