Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a321798 authored by Joachim Eastwood's avatar Joachim Eastwood Committed by David S. Miller
Browse files

stmmac: convert dwmac-sti to platform driver 



Convert platform glue layer into a proper platform
driver and add it to the build system.

Signed-off-by: default avatarJoachim Eastwood <manabian@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c7c52ae7

drivers/net/ethernet/stmicro/stmmac/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -78,6 +78,18 @@ config DWMAC_SOCFPGA 
	  for the stmmac device driver. This driver is used for

	  arria5 and cyclone5 FPGA SoCs.



config DWMAC_STI

	tristate "STi GMAC support"

	default ARCH_STI

	depends on OF

	select MFD_SYSCON

	---help---

	  Support for ethernet controller on STi SOCs.



	  This selects STi SoC glue layer support for the stmmac

	  device driver. This driver is used on for the STi series

	  SOCs GMAC ethernet controller.



endif



config STMMAC_PCI

drivers/net/ethernet/stmicro/stmmac/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ obj-$(CONFIG_DWMAC_LPC18XX) += dwmac-lpc18xx.o 
obj-$(CONFIG_DWMAC_MESON)	+= dwmac-meson.o

obj-$(CONFIG_DWMAC_ROCKCHIP)	+= dwmac-rk.o

obj-$(CONFIG_DWMAC_SOCFPGA)	+= dwmac-socfpga.o

obj-$(CONFIG_DWMAC_STI)		+= dwmac-sti.o

obj-$(CONFIG_DWMAC_GENERIC)	+= dwmac-generic.o

stmmac-platform-objs:= stmmac_platform.o dwmac-sunxi.o \

		       dwmac-sti.o



obj-$(CONFIG_STMMAC_PCI) += stmmac-pci.o

stmmac-pci-objs:= stmmac_pci.o

drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c

+27 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/stmmac.h>

#include <linux/phy.h>

#include <linux/mfd/syscon.h>

#include <linux/module.h>

#include <linux/regmap.h>

#include <linux/clk.h>

#include <linux/of.h>
@@ -351,16 +352,40 @@ static void *sti_dwmac_setup(struct platform_device *pdev) 
	return dwmac;

}



const struct stmmac_of_data stih4xx_dwmac_data = {

static const struct stmmac_of_data stih4xx_dwmac_data = {

	.fix_mac_speed = stih4xx_fix_retime_src,

	.setup = sti_dwmac_setup,

	.init = stix4xx_init,

	.exit = sti_dwmac_exit,

};



const struct stmmac_of_data stid127_dwmac_data = {

static const struct stmmac_of_data stid127_dwmac_data = {

	.fix_mac_speed = stid127_fix_retime_src,

	.setup = sti_dwmac_setup,

	.init = stid127_init,

	.exit = sti_dwmac_exit,

};



static const struct of_device_id sti_dwmac_match[] = {

	{ .compatible = "st,stih415-dwmac", .data = &stih4xx_dwmac_data},

	{ .compatible = "st,stih416-dwmac", .data = &stih4xx_dwmac_data},

	{ .compatible = "st,stid127-dwmac", .data = &stid127_dwmac_data},

	{ .compatible = "st,stih407-dwmac", .data = &stih4xx_dwmac_data},

	{ }

};

MODULE_DEVICE_TABLE(of, sti_dwmac_match);



static struct platform_driver sti_dwmac_driver = {

	.probe  = stmmac_pltfr_probe,

	.remove = stmmac_pltfr_remove,

	.driver = {

		.name           = "sti-dwmac",

		.pm		= &stmmac_pltfr_pm_ops,

		.of_match_table = sti_dwmac_match,

	},

};

module_platform_driver(sti_dwmac_driver);



MODULE_AUTHOR("Srinivas Kandagatla <srinivas.kandagatla@st.com>");

MODULE_DESCRIPTION("STMicroelectronics DWMAC Specific Glue layer");

MODULE_LICENSE("GPL");

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c

+0 −4
Original line number Diff line number Diff line
@@ -35,10 +35,6 @@ 
static const struct of_device_id stmmac_dt_ids[] = {

	/* SoC specific glue layers should come before generic bindings */

	{ .compatible = "allwinner,sun7i-a20-gmac", .data = &sun7i_gmac_data},

	{ .compatible = "st,stih415-dwmac", .data = &stih4xx_dwmac_data},

	{ .compatible = "st,stih416-dwmac", .data = &stih4xx_dwmac_data},

	{ .compatible = "st,stid127-dwmac", .data = &stid127_dwmac_data},

	{ .compatible = "st,stih407-dwmac", .data = &stih4xx_dwmac_data},

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, stmmac_dt_ids);

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.h

+0 −2
Original line number Diff line number Diff line
@@ -24,7 +24,5 @@ int stmmac_pltfr_remove(struct platform_device *pdev); 
extern const struct dev_pm_ops stmmac_pltfr_pm_ops;



extern const struct stmmac_of_data sun7i_gmac_data;

extern const struct stmmac_of_data stih4xx_dwmac_data;

extern const struct stmmac_of_data stid127_dwmac_data;



#endif /* __STMMAC_PLATFORM_H__ */