Commit bd31342f authored by NeilBrown's avatar NeilBrown Committed by Greg Kroah-Hartman
Browse files

staging: remove mt7621-eth 



driver/net/ethernet/mediatek/ now supports this hardware,
so we don't need a separate driver.

Signed-off-by: default avatarNeilBrown <neil@brown.name>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9e98c678

drivers/staging/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -114,8 +114,6 @@ source "drivers/staging/ralink-gdma/Kconfig" 


source "drivers/staging/mt7621-mmc/Kconfig"



source "drivers/staging/mt7621-eth/Kconfig"



source "drivers/staging/mt7621-dts/Kconfig"



source "drivers/staging/gasket/Kconfig"

drivers/staging/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ obj-$(CONFIG_SPI_MT7621) += mt7621-spi/ 
obj-$(CONFIG_SOC_MT7621)	+= mt7621-dma/

obj-$(CONFIG_DMA_RALINK)	+= ralink-gdma/

obj-$(CONFIG_MTK_MMC)		+= mt7621-mmc/

obj-$(CONFIG_NET_MEDIATEK_SOC_STAGING)	+= mt7621-eth/

obj-$(CONFIG_SOC_MT7621)	+= mt7621-dts/

obj-$(CONFIG_STAGING_GASKET_FRAMEWORK)	+= gasket/

obj-$(CONFIG_XIL_AXIS_FIFO)	+= axis-fifo/

drivers/staging/mt7621-eth/Documentation/devicetree/bindings/net/mediatek-net-gsw.txt

deleted100644 → 0
+0 −48
Original line number Diff line number Diff line 
Mediatek Gigabit Switch

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



The mediatek gigabit switch can be found on Mediatek SoCs.



Required properties:

- compatible: Should be "mediatek,mt7620-gsw", "mediatek,mt7621-gsw",

  "mediatek,mt7623-gsw"

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

- interrupts: Should contain the gigabit switches interrupt





Additional required properties for ARM based SoCs:

- mediatek,reset-pin: phandle describing the reset GPIO

- clocks: the clocks used by the switch

- clock-names: the names of the clocks listed in the clocks property

  these should be "trgpll", "esw", "gp2", "gp1"

- mt7530-supply: the phandle of the regulator used to power the switch

- mediatek,pctl-regmap: phandle to the port control regmap. this is used to

  setup the drive current





Optional properties:

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

  that services interrupts for this device



Example:



gsw: switch@1b100000 {

	compatible = "mediatek,mt7623-gsw";

	reg = <0 0x1b110000 0 0x300000>;



	interrupt-parent = <&pio>;

	interrupts = <168 IRQ_TYPE_EDGE_RISING>;



	clocks = <&apmixedsys CLK_APMIXED_TRGPLL>,

		 <&ethsys CLK_ETHSYS_ESW>,

		 <&ethsys CLK_ETHSYS_GP2>,

		 <&ethsys CLK_ETHSYS_GP1>;

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



	mt7530-supply = <&mt6323_vpa_reg>;



	mediatek,pctl-regmap = <&syscfg_pctl_a>;

	mediatek,reset-pin = <&pio 15 0>;



	status = "okay";

};

drivers/staging/mt7621-eth/Kconfig

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
config NET_VENDOR_MEDIATEK_STAGING

	bool "MediaTek ethernet driver - staging version"

	depends on RALINK

	---help---

	  If you have an MT7621 Mediatek SoC with ethernet, say Y.



if NET_VENDOR_MEDIATEK_STAGING

choice

	prompt "MAC type"



config NET_MEDIATEK_MT7621

	bool "MT7621"

	depends on MIPS && SOC_MT7621



endchoice



config NET_MEDIATEK_SOC_STAGING

	tristate "MediaTek SoC Gigabit Ethernet support"

	depends on NET_VENDOR_MEDIATEK_STAGING

	select PHYLIB

	---help---

	  This driver supports the gigabit ethernet MACs in the

	  MediaTek SoC family.



config NET_MEDIATEK_MDIO

	def_bool NET_MEDIATEK_SOC_STAGING

	depends on NET_MEDIATEK_MT7621

	select PHYLIB



config NET_MEDIATEK_MDIO_MT7620

	def_bool NET_MEDIATEK_SOC_STAGING

	depends on NET_MEDIATEK_MT7621

	select NET_MEDIATEK_MDIO



config NET_MEDIATEK_GSW_MT7621

	def_tristate NET_MEDIATEK_SOC_STAGING

	depends on NET_MEDIATEK_MT7621



endif #NET_VENDOR_MEDIATEK_STAGING

drivers/staging/mt7621-eth/Makefile

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
#

# Makefile for the Ralink SoCs built-in ethernet macs

#



mtk-eth-soc-y					+= mtk_eth_soc.o ethtool.o



mtk-eth-soc-$(CONFIG_NET_MEDIATEK_MDIO)		+= mdio.o

mtk-eth-soc-$(CONFIG_NET_MEDIATEK_MDIO_MT7620)	+= mdio_mt7620.o



mtk-eth-soc-$(CONFIG_NET_MEDIATEK_MT7621)	+= soc_mt7621.o



obj-$(CONFIG_NET_MEDIATEK_GSW_MT7621)		+= gsw_mt7621.o



obj-$(CONFIG_NET_MEDIATEK_SOC_STAGING)		+= mtk-eth-soc.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE