diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6dl-sabreauto-enetirq.dts | 3 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6dl-sabresd-enetirq.dts | 15 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6q-sabreauto-enetirq.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6q-sabresd-enetirq.dts | 15 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 6 |
6 files changed, 41 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 8d350c869432..7efa2bd56a30 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -443,6 +443,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6dl-sabresd.dtb \ imx6dl-sabresd-btwifi.dtb \ imx6dl-sabresd-hdcp.dtb \ + imx6dl-sabresd-enetirq.dtb \ imx6dl-savageboard.dtb \ imx6dl-ts4900.dtb \ imx6dl-ts7970.dtb \ @@ -529,6 +530,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6q-sabresd-btwifi.dtb \ imx6q-sabresd-hdcp.dtb \ imx6q-sabresd-uart.dtb \ + imx6q-sabresd-enetirq.dtb \ imx6q-savageboard.dtb \ imx6q-sbc6x.dtb \ imx6q-tbs2910.dtb \ diff --git a/arch/arm/boot/dts/imx6dl-sabreauto-enetirq.dts b/arch/arm/boot/dts/imx6dl-sabreauto-enetirq.dts index 68d0938c6e4c..d50a87334ef1 100644 --- a/arch/arm/boot/dts/imx6dl-sabreauto-enetirq.dts +++ b/arch/arm/boot/dts/imx6dl-sabreauto-enetirq.dts @@ -1,13 +1,14 @@ // SPDX-License-Identifier: GPL-2.0 // // Copyright (C) 2013 Freescale Semiconductor, Inc. +// Copyright 2019 NXP #include "imx6dl-sabreauto.dts" &fec { pinctrl-0 = <&pinctrl_enet &pinctrl_enet_irq>; interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, - <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; + <&gpc 0 119 IRQ_TYPE_LEVEL_HIGH>; }; &mlb { 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..a2f26a75be37 --- /dev/null +++ b/arch/arm/boot/dts/imx6dl-sabresd-enetirq.dts @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (C) 2014 Freescale Semiconductor, Inc. +// Copyright 2019 NXP + +#include "imx6dl-sabresd.dts" + +&fec { + pinctrl-0 = <&pinctrl_enet &pinctrl_enet_irq>; + interrupts-extended = <&gpio1 6 0x4>, <&gpc 0 119 0x4>; +}; + +&i2c3 { + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/imx6q-sabreauto-enetirq.dts b/arch/arm/boot/dts/imx6q-sabreauto-enetirq.dts index 47e841b8cab1..14f9a33d2e59 100644 --- a/arch/arm/boot/dts/imx6q-sabreauto-enetirq.dts +++ b/arch/arm/boot/dts/imx6q-sabreauto-enetirq.dts @@ -7,7 +7,7 @@ &fec { pinctrl-0 = <&pinctrl_enet &pinctrl_enet_irq>; interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, - <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; + <&gpc 0 119 IRQ_TYPE_LEVEL_HIGH>; }; &mlb { 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..cd8b56cc0af9 --- /dev/null +++ b/arch/arm/boot/dts/imx6q-sabresd-enetirq.dts @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (C) 2014 Freescale Semiconductor, Inc. +// Copyright 2019 NXP + +#include "imx6q-sabresd.dts" + +&fec { + pinctrl-0 = <&pinctrl_enet &pinctrl_enet_irq>; + interrupts-extended = <&gpio1 6 0x4>, <&gpc 0 119 0x4>; +}; + +&i2c3 { + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi index 19d1f92064bf..bf4ee696188c 100644 --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi @@ -716,6 +716,12 @@ >; }; + pinctrl_enet_irq: enetirqgrp { + fsl,pins = < + MX6QDL_PAD_GPIO_6__ENET_IRQ 0x000b1 + >; + }; + pinctrl_gpio_keys: gpio_keysgrp { fsl,pins = < MX6QDL_PAD_EIM_D29__GPIO3_IO29 0x1b0b0 |