hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

stmmac: dwmac-ipq806x: turn setup callback into a probe function 

By using a few functions from stmmac_platform a proper probe
function can be created from the setup glue callback. This
makes it look more like a standard driver and the OF match
data can also be dropped.

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joachim Eastwood 2015-07-29 00:08:50 +02:00 committed by David S. Miller
parent 213088f6fa
commit 5ed1c04a38
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c
View File

@ -255,23 +255,33 @@ static void ipq806x_gmac_fix_mac_speed(void *priv, unsigned int speed)
ipq806x_gmac_set_speed(gmac, speed); ipq806x_gmac_set_speed(gmac, speed);
} }
static void *ipq806x_gmac_setup(struct platform_device *pdev) static int ipq806x_gmac_probe(struct platform_device *pdev)
{ {
struct plat_stmmacenet_data *plat_dat;
struct stmmac_resources stmmac_res;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct ipq806x_gmac *gmac; struct ipq806x_gmac *gmac;
int val; int val;
void *err; void *err;
val = stmmac_get_platform_resources(pdev, &stmmac_res);
if (val)
return val;
plat_dat = stmmac_probe_config_dt(pdev, &stmmac_res.mac);
if (IS_ERR(plat_dat))
return PTR_ERR(plat_dat);
gmac = devm_kzalloc(dev, sizeof(*gmac), GFP_KERNEL); gmac = devm_kzalloc(dev, sizeof(*gmac), GFP_KERNEL);
if (!gmac) if (!gmac)
return ERR_PTR(-ENOMEM); return -ENOMEM;
gmac->pdev = pdev; gmac->pdev = pdev;
err = ipq806x_gmac_of_parse(gmac); err = ipq806x_gmac_of_parse(gmac);
if (err) { if (IS_ERR(err)) {
dev_err(dev, "device tree parsing error\n"); dev_err(dev, "device tree parsing error\n");
return err; return PTR_ERR(err);
} }
regmap_write(gmac->qsgmii_csr, QSGMII_PCS_CAL_LCKDT_CTL, regmap_write(gmac->qsgmii_csr, QSGMII_PCS_CAL_LCKDT_CTL,
@ -292,7 +302,7 @@ static void *ipq806x_gmac_setup(struct platform_device *pdev)
default: default:
dev_err(&pdev->dev, "Unsupported PHY mode: \"%s\"\n", dev_err(&pdev->dev, "Unsupported PHY mode: \"%s\"\n",
phy_modes(gmac->phy_mode)); phy_modes(gmac->phy_mode));
return NULL; return -EINVAL;
} }
regmap_write(gmac->nss_common, NSS_COMMON_GMAC_CTL(gmac->id), val); regmap_write(gmac->nss_common, NSS_COMMON_GMAC_CTL(gmac->id), val);
@ -311,7 +321,7 @@ static void *ipq806x_gmac_setup(struct platform_device *pdev)
default: default:
dev_err(&pdev->dev, "Unsupported PHY mode: \"%s\"\n", dev_err(&pdev->dev, "Unsupported PHY mode: \"%s\"\n",
phy_modes(gmac->phy_mode)); phy_modes(gmac->phy_mode));
return NULL; return -EINVAL;
} }
regmap_write(gmac->nss_common, NSS_COMMON_CLK_SRC_CTRL, val); regmap_write(gmac->nss_common, NSS_COMMON_CLK_SRC_CTRL, val);
@ -334,23 +344,21 @@ static void *ipq806x_gmac_setup(struct platform_device *pdev)
0xC << QSGMII_PHY_TX_DRV_AMP_OFFSET); 0xC << QSGMII_PHY_TX_DRV_AMP_OFFSET);
} }
return gmac; plat_dat->has_gmac = true;
plat_dat->bsp_priv = gmac;
plat_dat->fix_mac_speed = ipq806x_gmac_fix_mac_speed;
return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
} }
static const struct stmmac_of_data ipq806x_gmac_data = {
.has_gmac = 1,
.setup = ipq806x_gmac_setup,
.fix_mac_speed = ipq806x_gmac_fix_mac_speed,
};
static const struct of_device_id ipq806x_gmac_dwmac_match[] = { static const struct of_device_id ipq806x_gmac_dwmac_match[] = {
{ .compatible = "qcom,ipq806x-gmac", .data = &ipq806x_gmac_data }, { .compatible = "qcom,ipq806x-gmac" },
{ } { }
}; };
MODULE_DEVICE_TABLE(of, ipq806x_gmac_dwmac_match); MODULE_DEVICE_TABLE(of, ipq806x_gmac_dwmac_match);
static struct platform_driver ipq806x_gmac_dwmac_driver = { static struct platform_driver ipq806x_gmac_dwmac_driver = {
.probe = stmmac_pltfr_probe, .probe = ipq806x_gmac_probe,
.remove = stmmac_pltfr_remove, .remove = stmmac_pltfr_remove,
.driver = { .driver = {
.name = "ipq806x-gmac-dwmac", .name = "ipq806x-gmac-dwmac",