From: Lauren Post Date: Tue, 1 Oct 2013 16:31:52 +0000 (-0500) Subject: imx6qsabreauto.conf: Add gpmi-weim DTS X-Git-Tag: 2.1~1126 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=172a77d7b187fc465e56d6fc11a9ffa6a1168309;p=meta-freescale.git imx6qsabreauto.conf: Add gpmi-weim DTS ENGR00269945: ARM: imx6: add the secondary sabreauto dts for pin conflict The patch is to solve the pin conflicts between devices that are currently added in imx6qdl-sabreauto dts file. It has ecspi1, i2c3, and uart3 enabled while gpmi and weim disabled in the primary imx6qdl-sabreauto.dtsi, and creates the secondary imx6q/dl-sabreauto dts to have gpmi and weim enabled while others disabled. Since usbh1 and usbotg depend on GPIO from max7310 on i2c3, they have to be disabled as well in the secondary sabreauto dts files. Change-Id: I6338e60fa8c1622b2a73e99aa1e3def0a2555bc2 Signed-off-by: Lauren Post --- diff --git a/meta-fsl-arm/conf/machine/imx6qsabreauto.conf b/meta-fsl-arm/conf/machine/imx6qsabreauto.conf index 4d367db3..7455255a 100644 --- a/meta-fsl-arm/conf/machine/imx6qsabreauto.conf +++ b/meta-fsl-arm/conf/machine/imx6qsabreauto.conf @@ -7,7 +7,7 @@ require conf/machine/include/imx6sabreauto-common.inc SOC_FAMILY = "mx6:mx6q" -KERNEL_DEVICETREE = "imx6q-sabreauto.dtb" +KERNEL_DEVICETREE = "imx6q-sabreauto.dtb imx6q-sabreauto-gpmi-weim.dtb" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "mx6qsabreauto_config,sdcard"