[meta-fsl-arm,v4,12/13] imx6qsabreauto.conf: Add ecspi and flexcan1 device tree support

Submitted by Otavio Salvador on Feb. 24, 2014, 6:46 p.m. | Patch ID: 67319


Message ID 1393267615-29009-13-git-send-email-otavio@ossystems.com.br
State Accepted, archived
Delegated to: Otavio Salvador
Headers show

Commit Message

Otavio Salvador Feb. 24, 2014, 6:46 p.m.
From: Lauren Post <lauren.post@freescale.com>

The flexcan1 device tree supports flexcan1 enabled with fec disabled
because of a pin conflict between flexcan1 and fec.

The ecspi device tree supports ecspi by fixing the pin conflict with i2c3.

Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

Changes in v4: None
Changes in v3: None
Changes in v2: None

 conf/machine/imx6qsabreauto.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/conf/machine/imx6qsabreauto.conf b/conf/machine/imx6qsabreauto.conf
index 93f8851..6d52f60 100644
--- a/conf/machine/imx6qsabreauto.conf
+++ b/conf/machine/imx6qsabreauto.conf
@@ -8,7 +8,8 @@  require conf/machine/include/imx6sabreauto-common.inc
 SOC_FAMILY = "mx6:mx6q"
-KERNEL_DEVICETREE = "imx6q-sabreauto.dtb imx6q-sabreauto-gpmi-weim.dtb"
+KERNEL_DEVICETREE = "imx6q-sabreauto.dtb imx6q-sabreauto-gpmi-weim.dtb imx6q-sabreauto-ecspi.dtb "
+KERNEL_DEVICETREE += "imx6q-sabreauto-flexcan1.dtb "
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6qsabreauto_config,sdcard"