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

Commit 293bb1c4 authored by Giuseppe CAVALLARO's avatar Giuseppe CAVALLARO Committed by David S. Miller
Browse files

stmmac: add init/exit callback in plat_stmmacenet_data struct 



This patch adds in the plat_stmmacenet_data
the init and exit callbacks that can be used
for invoking specific platform functions.
For example, on ST targets, these call the
PAD manager functions to set PIO lines and
syscfg registers.
The patch removes the stmmac_claim_resource
only used on STM Kernels as well.

Signed-off-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9dfeb4d9

drivers/net/stmmac/stmmac.h

+0 −22
Original line number Diff line number Diff line
@@ -87,28 +87,6 @@ struct stmmac_priv { 
	struct plat_stmmacenet_data *plat;

};



#ifdef CONFIG_STM_DRIVERS

#include <linux/stm/pad.h>

static inline int stmmac_claim_resource(struct platform_device *pdev)

{

	int ret = 0;

	struct plat_stmmacenet_data *plat_dat = pdev->dev.platform_data;



	/* Pad routing setup */

	if (IS_ERR(devm_stm_pad_claim(&pdev->dev, plat_dat->pad_config,

			dev_name(&pdev->dev)))) {

		printk(KERN_ERR "%s: Failed to request pads!\n", __func__);

		ret = -ENODEV;

	}

	return ret;

}

#else

static inline int stmmac_claim_resource(struct platform_device *pdev)

{

	return 0;

}

#endif



extern int stmmac_mdio_unregister(struct net_device *ndev);

extern int stmmac_mdio_register(struct net_device *ndev);

extern void stmmac_set_ethtool_ops(struct net_device *netdev);

drivers/net/stmmac/stmmac_main.c

+13 −5
Original line number Diff line number Diff line
@@ -1643,7 +1643,7 @@ static int stmmac_dvr_probe(struct platform_device *pdev) 
	struct resource *res;

	void __iomem *addr = NULL;

	struct net_device *ndev = NULL;

	struct stmmac_priv *priv;

	struct stmmac_priv *priv = NULL;

	struct plat_stmmacenet_data *plat_dat;



	pr_info("STMMAC driver:\n\tplatform registration... ");
@@ -1708,10 +1708,12 @@ static int stmmac_dvr_probe(struct platform_device *pdev) 
	/* Set the I/O base addr */

	ndev->base_addr = (unsigned long)addr;



	/* Verify embedded resource for the platform */

	ret = stmmac_claim_resource(pdev);

	if (ret < 0)

	/* Custom initialisation */

	if (priv->plat->init) {

		ret = priv->plat->init(pdev);

		if (unlikely(ret))

			goto out;

	}



	/* MAC HW revice detection */

	ret = stmmac_mac_device_setup(ndev);
@@ -1745,6 +1747,9 @@ static int stmmac_dvr_probe(struct platform_device *pdev) 


out:

	if (ret < 0) {

		if (priv->plat->exit)

			priv->plat->exit(pdev);



		platform_set_drvdata(pdev, NULL);

		release_mem_region(res->start, resource_size(res));

		if (addr != NULL)
@@ -1778,6 +1783,9 @@ static int stmmac_dvr_remove(struct platform_device *pdev) 


	stmmac_mdio_unregister(ndev);



	if (priv->plat->exit)

		priv->plat->exit(pdev);



	platform_set_drvdata(pdev, NULL);

	unregister_netdev(ndev);

include/linux/stmmac.h

+3 −3
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ struct plat_stmmacenet_data { 
	int pmt;

	void (*fix_mac_speed)(void *priv, unsigned int speed);

	void (*bus_setup)(void __iomem *ioaddr);

#ifdef CONFIG_STM_DRIVERS

	struct stm_pad_config *pad_config;

#endif

	int (*init)(struct platform_device *pdev);

	void (*exit)(struct platform_device *pdev);

	void *custom_cfg;

	void *bsp_priv;

};