aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauren Post <lauren.post@freescale.com>2013-10-01 11:29:20 -0500
committerOtavio Salvador <otavio@ossystems.com.br>2013-11-13 15:46:30 -0200
commit6097d786073999d100a60b1600e20e99563a2e9a (patch)
treeed182e41c29c3a488df6cd2a853fab493ac32465
parent068a234a1699046c8e7ad59b1566d0293b6dd5c8 (diff)
downloadmeta-fsl-arm-6097d786073999d100a60b1600e20e99563a2e9a.tar.gz
meta-fsl-arm-6097d786073999d100a60b1600e20e99563a2e9a.tar.bz2
meta-fsl-arm-6097d786073999d100a60b1600e20e99563a2e9a.zip
imxdlsabreauto.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: I1f51cda59468140a2552a73fca5d710ecde1967e Signed-off-by: Lauren Post <lauren.post@freescale.com>
-rw-r--r--conf/machine/imx6dlsabreauto.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/imx6dlsabreauto.conf b/conf/machine/imx6dlsabreauto.conf
index e0fb199..3909283 100644
--- a/conf/machine/imx6dlsabreauto.conf
+++ b/conf/machine/imx6dlsabreauto.conf
@@ -7,7 +7,7 @@ require conf/machine/include/imx6sabreauto-common.inc
SOC_FAMILY = "mx6:mx6dl"
-KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb"
+KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb"
PREFERRED_PROVIDER_u-boot = "u-boot-imx"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"