From: Lauren Post Date: Mon, 16 Dec 2013 16:48:07 +0000 (-0600) Subject: imx6slevk: Add new device tree imx6sl-evk-csi.dtb X-Git-Tag: 2.1~1032 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=36573553d5f681e4f8d32b17135c7cf6b48703aa;p=meta-freescale.git imx6slevk: Add new device tree imx6sl-evk-csi.dtb 3.10.17-1.0.0-beta changed the imx6sl-evk.dts file to work with EPDC but as a consequence it breaks CSI function as its pins are shared. A new imx6sl-evk-csi.dts file has been add to allow use of CSI in case it is desired. Signed-off-by: Lauren Post Signed-off-by: Otavio Salvador --- diff --git a/meta-fsl-arm/conf/machine/imx6slevk.conf b/meta-fsl-arm/conf/machine/imx6slevk.conf index 8162b442..5c3d2fa5 100644 --- a/meta-fsl-arm/conf/machine/imx6slevk.conf +++ b/meta-fsl-arm/conf/machine/imx6slevk.conf @@ -9,7 +9,7 @@ include conf/machine/include/tune-cortexa9.inc SOC_FAMILY = "mx6:mx6sl" -KERNEL_DEVICETREE = "imx6sl-evk.dtb imx6sl-evk-ldo.dtb" +KERNEL_DEVICETREE = "imx6sl-evk.dtb imx6sl-evk-csi.dtb imx6sl-evk-ldo.dtb" UBOOT_MACHINE = "mx6slevk_config"