ENGR00313685-15 ARM: dts: imx: apply ENET IRQ workaround for sabresd board

This is pretty much an example to demonstrate how the GPIO6 workaround
for bug ERR006687 (ENET: Only the ENET wake-up interrupt request can
wake the system from Wait mode) should be applied for a board.

Basically it requires a setup of MX6QDL_PAD_GPIO_6__ENET_IRQ in pinctrl
entry, and an overwrite on the property interrupts-extended to replace
the ENET GIC IRQ with GPIO1_6.

Since the pad GPIO6 is used by I2C3 on the board, we have to create
sabresd-enetirq.dts with I2C3 disabled to enable this workaround.

Signed-off-by: Shawn Guo <shawn.guo@freescale.com>

4 files changed, 44 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index a02ff774c6da..e37e1a092912 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -118,6 +118,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
         imx6dl-sabreauto-flexcan1.dtb \
         imx6dl-sabreauto-gpmi-weim.dtb \
         imx6dl-sabresd.dtb \
+        imx6dl-sabresd-enetirq.dtb \
         imx6dl-sabresd-hdcp.dtb \
         imx6dl-sabresd-ldo.dtb \
         imx6dl-sabresd-pf200.dtb \
@@ -129,6 +130,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
         imx6q-sabreauto-gpmi-weim.dtb \
         imx6q-sabrelite.dtb \
         imx6q-sabresd.dtb \
+        imx6q-sabresd-enetirq.dtb \
         imx6q-sabresd-hdcp.dtb \
         imx6q-sabresd-ldo.dtb \
         imx6q-sbc6x.dtb \
diff --git a/arch/arm/boot/dts/imx6dl-sabresd-enetirq.dts b/arch/arm/boot/dts/imx6dl-sabresd-enetirq.dts
new file mode 100644
index 000000000000..f4da4941d156
--- /dev/null
+++ b/arch/arm/boot/dts/imx6dl-sabresd-enetirq.dts
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2014 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "imx6dl-sabresd.dts"
+
+&fec {
+        pinctrl-0 = <&pinctrl_enet_1 &pinctrl_enet_irq>;
+        interrupts-extended = <&gpio1 6 0x04>, <&intc 0 119 0x04>;
+};
+
+&i2c3 {
+        status = "disabled";
+};
diff --git a/arch/arm/boot/dts/imx6q-sabresd-enetirq.dts b/arch/arm/boot/dts/imx6q-sabresd-enetirq.dts
new file mode 100644
index 000000000000..8ccfad6df857
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-sabresd-enetirq.dts
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2014 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "imx6q-sabresd.dts"
+
+&fec {
+        pinctrl-0 = <&pinctrl_enet_1 &pinctrl_enet_irq>;
+        interrupts-extended = <&gpio1 6 0x04>, <&intc 0 119 0x04>;
+};
+
+&i2c3 {
+        status = "disabled";
+};
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 2f33815f3182..0bcf6573cdb6 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -1167,6 +1167,12 @@
                                 MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN     0x1b0b0
                         >;
                 };
+
+                pinctrl_enet_irq: enetirqgrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_GPIO_6__ENET_IRQ           0x000b1
+                        >;
+                };
         };
 
         esai {