[meta-fsl-arm,22/25] imx6qsabreauto.conf: Add gpmi-weim DTS

Submitted by Otavio Salvador on Oct. 28, 2013, 6:11 p.m. | Patch ID: 60651


Message ID 1382983863-5208-23-git-send-email-otavio@ossystems.com.br
State Deferred, archived
Delegated to: Otavio Salvador
Headers show

Commit Message

Otavio Salvador Oct. 28, 2013, 6:11 p.m.
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: I6338e60fa8c1622b2a73e99aa1e3def0a2555bc2
Signed-off-by: Lauren Post <lauren.post@freescale.com>
 conf/machine/imx6qsabreauto.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

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"