aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauren Post <lauren.post@freescale.com>2013-10-01 11:31:52 -0500
committerOtavio Salvador <otavio@ossystems.com.br>2013-11-13 15:46:30 -0200
commit6113055031f7708945aabaa0482f4631b1576218 (patch)
tree8f7d34d87bf6799e436a714fe297c7f014a65db0
parente6286b977bf410b6527b950c4d34470c2c9e3e1b (diff)
downloadmeta-fsl-arm-6113055031f7708945aabaa0482f4631b1576218.tar.gz
meta-fsl-arm-6113055031f7708945aabaa0482f4631b1576218.tar.bz2
meta-fsl-arm-6113055031f7708945aabaa0482f4631b1576218.zip
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 <lauren.post@freescale.com>
-rw-r--r--conf/machine/imx6qsabreauto.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/imx6qsabreauto.conf b/conf/machine/imx6qsabreauto.conf
index 4d367db..7455255 100644
--- a/conf/machine/imx6qsabreauto.conf
+++ b/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"