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

Commit 69bdd2d4 authored by Joachim Eastwood's avatar Joachim Eastwood Committed by David S. Miller
Browse files

stmmac: convert dwmac-lpc18xx to a 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 ba25020e

drivers/net/ethernet/stmicro/stmmac/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -36,6 +36,14 @@ config DWMAC_GENERIC 
	  platform specific code to function or is using platform

	  data for setup.



config DWMAC_LPC18XX

	tristate "NXP LPC18xx/43xx DWMAC support"

	default ARCH_LPC18XX

	depends on OF

	select MFD_SYSCON

	---help---

	  Support for NXP LPC18xx/43xx DWMAC Ethernet.



endif



config STMMAC_PCI

drivers/net/ethernet/stmicro/stmmac/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ stmmac-objs:= stmmac_main.o stmmac_ethtool.o stmmac_mdio.o ring_mode.o \ 


# Ordering matters. Generic driver must be last.

obj-$(CONFIG_STMMAC_PLATFORM)	+= stmmac-platform.o

obj-$(CONFIG_DWMAC_LPC18XX)	+= dwmac-lpc18xx.o

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

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

		       dwmac-sti.o dwmac-socfpga.o dwmac-rk.o		\

		       dwmac-lpc18xx.o



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

stmmac-pci-objs:= stmmac_pci.o

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

+26 −1
Original line number Diff line number Diff line
@@ -9,12 +9,16 @@ 
 */



#include <linux/mfd/syscon.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_net.h>

#include <linux/phy.h>

#include <linux/platform_device.h>

#include <linux/regmap.h>

#include <linux/stmmac.h>



#include "stmmac_platform.h"



/* Register defines for CREG syscon */

#define LPC18XX_CREG_CREG6			0x12c

# define LPC18XX_CREG_CREG6_ETHMODE_MASK	0x7
@@ -67,8 +71,29 @@ static int lpc18xx_dwmac_init(struct platform_device *pdev, void *priv) 
	return 0;

}



const struct stmmac_of_data lpc18xx_dwmac_data = {

static const struct stmmac_of_data lpc18xx_dwmac_data = {

	.has_gmac = 1,

	.setup = lpc18xx_dwmac_setup,

	.init = lpc18xx_dwmac_init,

};



static const struct of_device_id lpc18xx_dwmac_match[] = {

	{ .compatible = "nxp,lpc1850-dwmac", .data = &lpc18xx_dwmac_data },

	{ }

};

MODULE_DEVICE_TABLE(of, lpc18xx_dwmac_match);



static struct platform_driver lpc18xx_dwmac_driver = {

	.probe  = stmmac_pltfr_probe,

	.remove = stmmac_pltfr_remove,

	.driver = {

		.name           = "lpc18xx-dwmac",

		.pm		= &stmmac_pltfr_pm_ops,

		.of_match_table = lpc18xx_dwmac_match,

	},

};

module_platform_driver(lpc18xx_dwmac_driver);



MODULE_AUTHOR("Joachim Eastwood <manabian@gmail.com>");

MODULE_DESCRIPTION("DWMAC glue for LPC18xx/43xx Ethernet");

MODULE_LICENSE("GPL v2");

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

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ static const struct of_device_id stmmac_dt_ids[] = { 
	{ .compatible = "rockchip,rk3288-gmac", .data = &rk3288_gmac_data},

	{ .compatible = "amlogic,meson6-dwmac", .data = &meson6_dwmac_data},

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

	{ .compatible = "nxp,lpc1850-dwmac", .data = &lpc18xx_dwmac_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},

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

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ int stmmac_pltfr_probe(struct platform_device *pdev); 
int stmmac_pltfr_remove(struct platform_device *pdev);

extern const struct dev_pm_ops stmmac_pltfr_pm_ops;



extern const struct stmmac_of_data lpc18xx_dwmac_data;

extern const struct stmmac_of_data meson6_dwmac_data;

extern const struct stmmac_of_data sun7i_gmac_data;

extern const struct stmmac_of_data stih4xx_dwmac_data;