From 4930e0f7bdaae946eab3744e3e695de922a7bd8c Mon Sep 17 00:00:00 2001 From: Lauren Post Date: Mon, 16 Dec 2013 10:53:33 -0600 Subject: imx6qsabreauto.conf: Add ecspi and flexcan1 device tree support 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 Signed-off-by: Otavio Salvador --- conf/machine/imx6qsabreauto.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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" -- cgit v1.2.3-54-g00ecf