diff options
| author | Fugang Duan <b38611@freescale.com> | 2015-12-17 11:32:40 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:24:02 +0800 |
| commit | 2e59678c91c63ff30a44fb356cf9b1866e759900 (patch) | |
| tree | 567e581809bbf39934749dae05025d1aee09f2c5 /arch/arm/boot | |
| parent | 618c288a3c5e25a39c0eda37104be5f6085e8fb5 (diff) | |
MLK-12033 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: Fugang Duan <B38611@freescale.com>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6dl-sabreauto-enetirq.dts | 19 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6q-sabreauto-enetirq.dts | 19 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 8 |
4 files changed, 46 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 37050963f1fa..e8e3a9266fc7 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -384,6 +384,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6dl-riotboard.dtb \ imx6dl-sabreauto.dtb \ imx6dl-sabreauto-ecspi.dtb \ + imx6dl-sabreauto-enetirq.dtb \ imx6dl-sabreauto-flexcan1.dtb \ imx6dl-sabreauto-gpmi-weim.dtb \ imx6dl-sabrelite.dtb \ @@ -445,6 +446,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ imx6q-rex-pro.dtb \ imx6q-sabreauto.dtb \ imx6q-sabreauto-ecspi.dtb \ + imx6q-sabreauto-enetirq.dtb \ imx6q-sabreauto-flexcan1.dtb \ imx6q-sabreauto-gpmi-weim.dtb \ imx6q-sabrelite.dtb \ diff --git a/arch/arm/boot/dts/imx6dl-sabreauto-enetirq.dts b/arch/arm/boot/dts/imx6dl-sabreauto-enetirq.dts new file mode 100644 index 000000000000..906d1d9bcda0 --- /dev/null +++ b/arch/arm/boot/dts/imx6dl-sabreauto-enetirq.dts @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2015 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-sabreauto.dts" + +&fec { + pinctrl-0 = <&pinctrl_enet &pinctrl_enet_irq>; + interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, + <&gpc 0 119 IRQ_TYPE_LEVEL_HIGH>; +}; + +&mlb { + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/imx6q-sabreauto-enetirq.dts b/arch/arm/boot/dts/imx6q-sabreauto-enetirq.dts new file mode 100644 index 000000000000..7acb794fbaa6 --- /dev/null +++ b/arch/arm/boot/dts/imx6q-sabreauto-enetirq.dts @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2015 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-sabreauto.dts" + +&fec { + pinctrl-0 = <&pinctrl_enet &pinctrl_enet_irq>; + interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, + <&gpc 0 119 IRQ_TYPE_LEVEL_HIGH>; +}; + +&mlb { + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi index d352f65dcd11..493f0fa623e1 100644 --- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi @@ -445,8 +445,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; phy-mode = "rgmii"; - interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, - <&gpc 0 119 IRQ_TYPE_LEVEL_HIGH>; + fsl,magic-packet; fsl,err006687-workaround-present; status = "okay"; }; @@ -739,6 +738,11 @@ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b030 MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b030 MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8 + >; + }; + + pinctrl_enet_irq: enetirqgrp { + fsl,pins = < MX6QDL_PAD_GPIO_6__ENET_IRQ 0x000b1 >; }; |