Commit 10f79037 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mediatek-eth' 



John Crispin says:

====================
net-next: mediatek: add ethernet driver

This series adds support for the Mediatek ethernet core found on current ARM
based SoCs. The driver works on MT2701 and MT7623 SoCs

Instead of trying to upstream everything at once I decided to concentrate on
the important parts required to make current generation silicon work. The V3
series only includes the code required to make dual MAC setups work and only
supports the newer QDMA engine.

Changes in V5
* reduce the mdio timeut to HZ
* add a call to usleep_range() which schedules in the background.

Changes in V4
* remove ugly _FE macro, use offsetof() instead

Changes in V3
* only include code for MT2701/7623 support
* drop support for PDMA and older MIPS based SoCs
* drop switch support

Changes in V2
* change the namespace of the functions from fe_* to mtk_*
* add support for the latest generation of ARM SoCs
* add dual MAC support
* remove the swconfig specific bits
* remove most of the magic values and replace them with defines
* add verbose descriptions to the patches
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 04761890 0c272fc9

Documentation/devicetree/bindings/net/mediatek-net.txt

0 → 100644
+77 −0
Original line number Diff line number Diff line 
MediaTek Frame Engine Ethernet controller

=========================================



The frame engine ethernet controller can be found on MediaTek SoCs. These SoCs

have dual GMAC each represented by a child node..



* Ethernet controller node



Required properties:

- compatible: Should be "mediatek,mt7623-eth"

- reg: Address and length of the register set for the device

- interrupts: Should contain the frame engines interrupt

- clocks: the clock used by the core

- clock-names: the names of the clock listed in the clocks property. These are

	"ethif", "esw", "gp2", "gp1"

- power-domains: phandle to the power domain that the ethernet is part of

- resets: Should contain a phandle to the ethsys reset signal

- reset-names: Should contain the reset signal name "eth"

- mediatek,ethsys: phandle to the syscon node that handles the port setup

- mediatek,pctl: phandle to the syscon node that handles the ports slew rate

	and driver current



Optional properties:

- interrupt-parent: Should be the phandle for the interrupt controller

  that services interrupts for this device





* Ethernet MAC node



Required properties:

- compatible: Should be "mediatek,eth-mac"

- reg: The number of the MAC

- phy-handle: see ethernet.txt file in the same directory.



Example:



eth: ethernet@1b100000 {

	compatible = "mediatek,mt7623-eth";

	reg = <0 0x1b100000 0 0x20000>;

	clocks = <&topckgen CLK_TOP_ETHIF_SEL>,

		 <&ethsys CLK_ETHSYS_ESW>,

		 <&ethsys CLK_ETHSYS_GP2>,

		 <&ethsys CLK_ETHSYS_GP1>;

	clock-names = "ethif", "esw", "gp2", "gp1";

	interrupts = <GIC_SPI 200 IRQ_TYPE_LEVEL_LOW>;

	power-domains = <&scpsys MT2701_POWER_DOMAIN_ETH>;

	resets = <&ethsys MT2701_ETHSYS_ETH_RST>;

	reset-names = "eth";

	mediatek,ethsys = <&ethsys>;

	mediatek,pctl = <&syscfg_pctl_a>;

	#address-cells = <1>;

	#size-cells = <0>;



	gmac1: mac@0 {

		compatible = "mediatek,eth-mac";

		reg = <0>;

		phy-handle = <&phy0>;

	};



	gmac2: mac@1 {

		compatible = "mediatek,eth-mac";

		reg = <1>;

		phy-handle = <&phy1>;

	};



	mdio-bus {

		phy0: ethernet-phy@0 {

			reg = <0>;

			phy-mode = "rgmii";

		};



		phy1: ethernet-phy@1 {

			reg = <1>;

			phy-mode = "rgmii";

		};

	};

};

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -7035,6 +7035,13 @@ F: include/uapi/linux/meye.h 
F:	include/uapi/linux/ivtv*

F:	include/uapi/linux/uvcvideo.h



MEDIATEK ETHERNET DRIVER

M:	Felix Fietkau <nbd@openwrt.org>

M:	John Crispin <blogic@openwrt.org>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/ethernet/mediatek/



MEDIATEK MT7601U WIRELESS LAN DRIVER

M:	Jakub Kicinski <kubakici@wp.pl>

L:	linux-wireless@vger.kernel.org

drivers/net/ethernet/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ config LANTIQ_ETOP 
	  Support for the MII0 inside the Lantiq SoC



source "drivers/net/ethernet/marvell/Kconfig"

source "drivers/net/ethernet/mediatek/Kconfig"

source "drivers/net/ethernet/mellanox/Kconfig"

source "drivers/net/ethernet/micrel/Kconfig"

source "drivers/net/ethernet/microchip/Kconfig"

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ obj-$(CONFIG_JME) += jme.o 
obj-$(CONFIG_KORINA) += korina.o

obj-$(CONFIG_LANTIQ_ETOP) += lantiq_etop.o

obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/

obj-$(CONFIG_NET_VENDOR_MEDIATEK) += mediatek/

obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/

obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/

obj-$(CONFIG_NET_VENDOR_MICROCHIP) += microchip/

drivers/net/ethernet/mediatek/Kconfig

0 → 100644
+17 −0
Original line number Diff line number Diff line 
config NET_VENDOR_MEDIATEK

	bool "MediaTek ethernet driver"

	depends on ARCH_MEDIATEK

	---help---

	  If you have a Mediatek SoC with ethernet, say Y.



if NET_VENDOR_MEDIATEK



config NET_MEDIATEK_SOC

	tristate "MediaTek MT7623 Gigabit ethernet support"

	depends on NET_VENDOR_MEDIATEK && (MACH_MT7623 || MACH_MT2701)

	select PHYLIB

	---help---

	  This driver supports the gigabit ethernet MACs in the

	  MediaTek MT2701/MT7623 chipset family.



endif #NET_VENDOR_MEDIATEK

CRA Git | Maintained and supported by SUSTech CRA and CCSE