From 42e19a7178ec416e7cb10367d3b5a6802ba43594 Mon Sep 17 00:00:00 2001 From: Fancy Fang Date: Fri, 5 Sep 2014 09:23:27 +0800 Subject: [PATCH] ENGR00330358 ARM: IMX6SL-EVK: PXP-V4L2: add pxp v4l2 support to 3.14 branch 1. Add the 'pxp_v4l2_out' entry to imx6sl-evk.dtb to enable the pxp v4l2 output driver. 2. Correct the backlight device node position in imx6sl-evk.dtb. Signed-off-by: Fancy Fang --- arch/arm/boot/dts/imx6sl-evk.dts | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts index bede1339aa19..419d6f916843 100644 --- a/arch/arm/boot/dts/imx6sl-evk.dts +++ b/arch/arm/boot/dts/imx6sl-evk.dts @@ -49,13 +49,18 @@ gpio = <&gpio4 2 0>; enable-active-high; }; + }; - backlight { - compatible = "pwm-backlight"; - pwms = <&pwm1 0 5000000>; - brightness-levels = <0 4 8 16 32 64 128 255>; - default-brightness-level = <6>; - }; + backlight { + compatible = "pwm-backlight"; + pwms = <&pwm1 0 5000000>; + brightness-levels = <0 4 8 16 32 64 128 255>; + default-brightness-level = <6>; + }; + + pxp_v4l2_out { + compatible = "fsl,imx6sl-pxp-v4l2"; + status = "okay"; }; }; -- 2.39.2