From 53543176b87a38fe07e1abb6ef520d04fe4af828 Mon Sep 17 00:00:00 2001 From: Lauren Post Date: Thu, 31 Mar 2016 10:25:24 -0500 Subject: [PATCH] imx6dlsabreauto and imx6qsabreauto: Add sabreauto-enetirq device tree ARM: dts: imx6qdl-sabreauto: add enet irq dts files to avoid conflict with MLB ENET gpio irq pin conlict with MLB on i.MX6qdl sabreauto board, since enet gpio irq is extended feature for performance improvement, so let MLB enable in default dts file and newly create sabreauto enet irq dts files. Signed-off-by: Lauren Post Signed-off-by: Otavio Salvador --- conf/machine/imx6dlsabreauto.conf | 4 ++-- conf/machine/imx6qsabreauto.conf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/machine/imx6dlsabreauto.conf b/conf/machine/imx6dlsabreauto.conf index 8c0fe858..a9bdfe5e 100644 --- a/conf/machine/imx6dlsabreauto.conf +++ b/conf/machine/imx6dlsabreauto.conf @@ -8,8 +8,8 @@ require conf/machine/include/imx6sabreauto-common.inc SOC_FAMILY = "mx6:mx6dl" -KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb imx6dl-sabreauto-ecspi.dtb " -KERNEL_DEVICETREE += "imx6dl-sabreauto-flexcan1.dtb " +KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb imx6dl-sabreauto-ecspi.dtb \ + imx6dl-sabreauto-flexcan1.dtb imx6dl-sabreauto-enetirq.dtb" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "mx6dlsabreauto_config,sdcard" diff --git a/conf/machine/imx6qsabreauto.conf b/conf/machine/imx6qsabreauto.conf index b8fdce4b..3429551e 100644 --- a/conf/machine/imx6qsabreauto.conf +++ b/conf/machine/imx6qsabreauto.conf @@ -8,8 +8,8 @@ require conf/machine/include/imx6sabreauto-common.inc SOC_FAMILY = "mx6:mx6q" -KERNEL_DEVICETREE = "imx6q-sabreauto.dtb imx6q-sabreauto-gpmi-weim.dtb imx6q-sabreauto-ecspi.dtb " -KERNEL_DEVICETREE += "imx6q-sabreauto-flexcan1.dtb " +KERNEL_DEVICETREE = "imx6q-sabreauto.dtb imx6q-sabreauto-gpmi-weim.dtb imx6q-sabreauto-ecspi.dtb \ + imx6q-sabreauto-flexcan1.dtb imx6q-sabreauto-enetirq.dtb" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "mx6qsabreauto_config,sdcard" -- 2.40.1