github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-27 16:44:58 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge branch 'net-stmmac-loongson1-cleanups'

Browse Source 
Russell King says:

====================
net: stmmac: loongson1: cleanups

A couple of patches to cleanup loongson1. First, introducing a match
data struct to allow the per-match data to be extended beyond the init
function pointer, and then adding a setup method to allow the resource
base address to be translated to the MAC index at probe time rather
than repeatedly in the setup function.
====================

Link: https://patch.msgid.link/aFKXzlno7HkG-cNh@shell.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2025-06-19 15:25:26 -07:00
commit 9ce3f34c43
1 changed files with 58 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson1.c
View File

@ -44,24 +44,50 @@
struct ls1x_dwmac {
struct plat_stmmacenet_data *plat_dat;
struct regmap *regmap;
unsigned int id;
};
struct ls1x_data {
int (*setup)(struct platform_device *pdev,
struct plat_stmmacenet_data *plat_dat);
int (*init)(struct platform_device *pdev, void *bsp_priv);
};
static int ls1b_dwmac_setup(struct platform_device *pdev,
struct plat_stmmacenet_data *plat_dat)
{
struct ls1x_dwmac *dwmac = plat_dat->bsp_priv;
struct resource *res;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
/* This shouldn't fail - stmmac_get_platform_resources()
* already mapped this resource.
*/
dev_err(&pdev->dev, "Could not get IO_MEM resources\n");
return -EINVAL;
}
if (res->start == LS1B_GMAC0_BASE) {
dwmac->id = 0;
} else if (res->start == LS1B_GMAC1_BASE) {
dwmac->id = 1;
} else {
dev_err(&pdev->dev, "Invalid Ethernet MAC base address %pR",
res);
return -EINVAL;
}
return 0;
}
static int ls1b_dwmac_syscon_init(struct platform_device *pdev, void *priv)
{
struct ls1x_dwmac *dwmac = priv;
struct plat_stmmacenet_data *plat = dwmac->plat_dat;
struct regmap *regmap = dwmac->regmap;
struct resource *res;
unsigned long reg_base;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
dev_err(&pdev->dev, "Could not get IO_MEM resources\n");
return -EINVAL;
}
reg_base = (unsigned long)res->start;
if (reg_base == LS1B_GMAC0_BASE) {
if (dwmac->id == 0) {
switch (plat->phy_interface) {
case PHY_INTERFACE_MODE_RGMII_ID:
regmap_update_bits(regmap, LS1X_SYSCON0,
@ -80,7 +106,7 @@ static int ls1b_dwmac_syscon_init(struct platform_device *pdev, void *priv)
}
regmap_update_bits(regmap, LS1X_SYSCON0, GMAC0_SHUT, 0);
} else if (reg_base == LS1B_GMAC1_BASE) {
} else if (dwmac->id == 1) {
regmap_update_bits(regmap, LS1X_SYSCON0,
GMAC1_USE_UART1 | GMAC1_USE_UART0,
GMAC1_USE_UART1 | GMAC1_USE_UART0);
@ -104,10 +130,6 @@ static int ls1b_dwmac_syscon_init(struct platform_device *pdev, void *priv)
}
regmap_update_bits(regmap, LS1X_SYSCON1, GMAC1_SHUT, 0);
} else {
dev_err(&pdev->dev, "Invalid Ethernet MAC base address %lx",
reg_base);
return -EINVAL;
}
return 0;
@ -143,9 +165,9 @@ static int ls1x_dwmac_probe(struct platform_device *pdev)
{
struct plat_stmmacenet_data *plat_dat;
struct stmmac_resources stmmac_res;
const struct ls1x_data *data;
struct regmap *regmap;
struct ls1x_dwmac *dwmac;
int (*init)(struct platform_device *pdev, void *priv);
int ret;
ret = stmmac_get_platform_resources(pdev, &stmmac_res);
@ -159,8 +181,8 @@ static int ls1x_dwmac_probe(struct platform_device *pdev)
return dev_err_probe(&pdev->dev, PTR_ERR(regmap),
"Unable to find syscon\n");
init = of_device_get_match_data(&pdev->dev);
if (!init) {
data = of_device_get_match_data(&pdev->dev);
if (!data) {
dev_err(&pdev->dev, "No of match data provided\n");
return -EINVAL;
}
@ -175,21 +197,36 @@ static int ls1x_dwmac_probe(struct platform_device *pdev)
"dt configuration failed\n");
plat_dat->bsp_priv = dwmac;
plat_dat->init = init;
plat_dat->init = data->init;
dwmac->plat_dat = plat_dat;
dwmac->regmap = regmap;
if (data->setup) {
ret = data->setup(pdev, plat_dat);
if (ret)
return ret;
}
return devm_stmmac_pltfr_probe(pdev, plat_dat, &stmmac_res);
}
static const struct ls1x_data ls1b_dwmac_data = {
.setup = ls1b_dwmac_setup,
.init = ls1b_dwmac_syscon_init,
};
static const struct ls1x_data ls1c_dwmac_data = {
.init = ls1c_dwmac_syscon_init,
};
static const struct of_device_id ls1x_dwmac_match[] = {
{
.compatible = "loongson,ls1b-gmac",
.data = &ls1b_dwmac_syscon_init,
.data = &ls1b_dwmac_data,
},
{
.compatible = "loongson,ls1c-emac",
.data = &ls1c_dwmac_syscon_init,
.data = &ls1c_dwmac_data,
},
{ }
};