From 90a43ea899329e0a107edf7a9af30d02e9124c80 Mon Sep 17 00:00:00 2001 From: Anson Huang Date: Mon, 19 Oct 2015 17:34:54 +0800 Subject: [PATCH] MLK-11739-2 ARM: dts: imx6qdl: fec interrupt should be in GPC domain GPC irq domain is child domain of GIC, all of platform irqs should be inside GPC domain. Signed-off-by: Anson Huang --- arch/arm/boot/dts/imx6dl-sabresd-enetirq.dts | 2 +- arch/arm/boot/dts/imx6q-sabresd-enetirq.dts | 2 +- arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 +- arch/arm/boot/dts/imx6qdl.dtsi | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/imx6dl-sabresd-enetirq.dts b/arch/arm/boot/dts/imx6dl-sabresd-enetirq.dts index b23d0eb55486..ff4144113d5a 100644 --- a/arch/arm/boot/dts/imx6dl-sabresd-enetirq.dts +++ b/arch/arm/boot/dts/imx6dl-sabresd-enetirq.dts @@ -10,7 +10,7 @@ &fec { pinctrl-0 = <&pinctrl_enet &pinctrl_enet_irq>; - interrupts-extended = <&gpio1 6 0x04>, <&intc 0 119 0x04>; + interrupts-extended = <&gpio1 6 0x04>, <&gpc 0 119 0x04>; }; &i2c3 { diff --git a/arch/arm/boot/dts/imx6q-sabresd-enetirq.dts b/arch/arm/boot/dts/imx6q-sabresd-enetirq.dts index 14b1cfa3d4c8..69da4046a75b 100644 --- a/arch/arm/boot/dts/imx6q-sabresd-enetirq.dts +++ b/arch/arm/boot/dts/imx6q-sabresd-enetirq.dts @@ -10,7 +10,7 @@ &fec { pinctrl-0 = <&pinctrl_enet &pinctrl_enet_irq>; - interrupts-extended = <&gpio1 6 0x04>, <&intc 0 119 0x04>; + interrupts-extended = <&gpio1 6 0x04>, <&gpc 0 119 0x04>; }; &i2c3 { diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi index 71bb8edd0fd0..d2dd05de210f 100644 --- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi @@ -340,7 +340,7 @@ pinctrl-0 = <&pinctrl_enet>; phy-mode = "rgmii"; interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, - <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; + <&gpc 0 119 IRQ_TYPE_LEVEL_HIGH>; fsl,err006687-workaround-present; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index d1868d1ee1a9..5b5cc9625617 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -1085,8 +1085,8 @@ compatible = "fsl,imx6q-fec"; reg = <0x02188000 0x4000>; interrupts-extended = - <&intc 0 118 IRQ_TYPE_LEVEL_HIGH>, - <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; + <&gpc 0 118 IRQ_TYPE_LEVEL_HIGH>, + <&gpc 0 119 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6QDL_CLK_ENET>, <&clks IMX6QDL_CLK_ENET>, <&clks IMX6QDL_CLK_ENET_REF>; -- 2.17.1