From ca2df6352c449d4415e46522c2a18632a17a9579 Mon Sep 17 00:00:00 2001 From: Vipul Kumar Date: Fri, 22 Mar 2019 15:57:29 +0530 Subject: [PATCH] arm: dts: imx6ul: removing dependency from imx6ul-14x14-evk.dtsi This patch remove dependency from imx6ul-14x14-evk.dtsi. By including this file, getting duplicate enteries for multiple nodes. To fix the compilation error, added some nodes in imx6ul-14x14-evk.dts. Signed-off-by: Vipul Kumar (cherry picked from commit 35bdde32c22154caba585d295b4a6c327045981c) --- arch/arm/boot/dts/imx6ul-14x14-evk.dts | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dts b/arch/arm/boot/dts/imx6ul-14x14-evk.dts index 40fce4550182..5159615ece81 100644 --- a/arch/arm/boot/dts/imx6ul-14x14-evk.dts +++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dts @@ -5,7 +5,6 @@ /dts-v1/; #include "imx6ul.dtsi" -#include "imx6ul-14x14-evk.dtsi" / { model = "Freescale i.MX6 UltraLite 14x14 EVK Board"; @@ -40,6 +39,17 @@ status = "okay"; }; + reg_sd1_vmmc: regulator-sd1-vmmc { + compatible = "regulator-fixed"; + regulator-name = "VSD_3V3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>; + off-on-delay = <20000>; + enable-active-high; + }; + + pxp_v4l2 { compatible = "fsl,imx6ul-pxp-v4l2", "fsl,imx6sx-pxp-v4l2", "fsl,imx6sl-pxp-v4l2"; status = "okay"; @@ -311,6 +321,12 @@ }; }; }; + + port { + display_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; }; &pwm1 { -- 2.17.1