Patchwork [meta-fsl-arm,05/10] imxdlsabreauto.conf: Add gpmi-weim DTS

login
register
mail settings
Submitter Otavio Salvador
Date Nov. 13, 2013, midnight
Message ID <1384300832-11051-5-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/61537/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Otavio Salvador - Nov. 13, 2013, midnight
From: Lauren Post <lauren.post@freescale.com>

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>
---
 conf/machine/imx6dlsabreauto.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

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"