summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauren Post <lauren.post@nxp.com>2016-03-31 10:25:24 -0500
committerOtavio Salvador <otavio@ossystems.com.br>2016-04-19 15:06:34 -0300
commit53543176b87a38fe07e1abb6ef520d04fe4af828 (patch)
tree549546dd1a8a2752b03287bed7f9ac170d233766
parentc44564de37eee1535d9f1faac29f6efc3a87da54 (diff)
downloadmeta-freescale-53543176b87a38fe07e1abb6ef520d04fe4af828.tar.gz
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 <lauren.post@nxp.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--conf/machine/imx6dlsabreauto.conf4
-rw-r--r--conf/machine/imx6qsabreauto.conf4
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
8 8
9SOC_FAMILY = "mx6:mx6dl" 9SOC_FAMILY = "mx6:mx6dl"
10 10
11KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb imx6dl-sabreauto-ecspi.dtb " 11KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb imx6dl-sabreauto-ecspi.dtb \
12KERNEL_DEVICETREE += "imx6dl-sabreauto-flexcan1.dtb " 12 imx6dl-sabreauto-flexcan1.dtb imx6dl-sabreauto-enetirq.dtb"
13 13
14UBOOT_CONFIG ??= "sd" 14UBOOT_CONFIG ??= "sd"
15UBOOT_CONFIG[sd] = "mx6dlsabreauto_config,sdcard" 15UBOOT_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
8 8
9SOC_FAMILY = "mx6:mx6q" 9SOC_FAMILY = "mx6:mx6q"
10 10
11KERNEL_DEVICETREE = "imx6q-sabreauto.dtb imx6q-sabreauto-gpmi-weim.dtb imx6q-sabreauto-ecspi.dtb " 11KERNEL_DEVICETREE = "imx6q-sabreauto.dtb imx6q-sabreauto-gpmi-weim.dtb imx6q-sabreauto-ecspi.dtb \
12KERNEL_DEVICETREE += "imx6q-sabreauto-flexcan1.dtb " 12 imx6q-sabreauto-flexcan1.dtb imx6q-sabreauto-enetirq.dtb"
13 13
14UBOOT_CONFIG ??= "sd" 14UBOOT_CONFIG ??= "sd"
15UBOOT_CONFIG[sd] = "mx6qsabreauto_config,sdcard" 15UBOOT_CONFIG[sd] = "mx6qsabreauto_config,sdcard"