Commit 770e709e authored by Nikita Shubin's avatar Nikita Shubin Committed by Arnd Bergmann
Browse files

net: cirrus: add DT support for Cirrus EP93xx 



- add OF ID match table
- get phy_id from the device tree, as part of mdio
- copy_addr is now always used, as there is no SoC/board that aren't
- dropped platform header

Signed-off-by: default avatarNikita Shubin <nikita.shubin@maquefel.me>
Tested-by: default avatarAlexander Sverdlin <alexander.sverdlin@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Acked-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 099747ce

drivers/net/ethernet/cirrus/ep93xx_eth.c

+32 −31
Original line number Diff line number Diff line
@@ -16,13 +16,12 @@ 
#include <linux/ethtool.h>

#include <linux/interrupt.h>

#include <linux/moduleparam.h>

#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/delay.h>

#include <linux/io.h>

#include <linux/slab.h>



#include <linux/platform_data/eth-ep93xx.h>



#define DRV_MODULE_NAME		"ep93xx-eth"



#define RX_QUEUE_ENTRIES	64
@@ -738,25 +737,6 @@ static const struct net_device_ops ep93xx_netdev_ops = { 
	.ndo_set_mac_address	= eth_mac_addr,

};



static struct net_device *ep93xx_dev_alloc(struct ep93xx_eth_data *data)

{

	struct net_device *dev;



	dev = alloc_etherdev(sizeof(struct ep93xx_priv));

	if (dev == NULL)

		return NULL;



	eth_hw_addr_set(dev, data->dev_addr);



	dev->ethtool_ops = &ep93xx_ethtool_ops;

	dev->netdev_ops = &ep93xx_netdev_ops;



	dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM;



	return dev;

}





static void ep93xx_eth_remove(struct platform_device *pdev)

{

	struct net_device *dev;
@@ -786,27 +766,47 @@ static void ep93xx_eth_remove(struct platform_device *pdev) 


static int ep93xx_eth_probe(struct platform_device *pdev)

{

	struct ep93xx_eth_data *data;

	struct net_device *dev;

	struct ep93xx_priv *ep;

	struct resource *mem;

	void __iomem *base_addr;

	struct device_node *np;

	u32 phy_id;

	int irq;

	int err;



	if (pdev == NULL)

		return -ENODEV;

	data = dev_get_platdata(&pdev->dev);



	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	irq = platform_get_irq(pdev, 0);

	if (!mem || irq < 0)

		return -ENXIO;



	dev = ep93xx_dev_alloc(data);

	base_addr = ioremap(mem->start, resource_size(mem));

	if (!base_addr)

		return dev_err_probe(&pdev->dev, -EIO, "Failed to ioremap ethernet registers\n");



	np = of_parse_phandle(pdev->dev.of_node, "phy-handle", 0);

	if (!np)

		return dev_err_probe(&pdev->dev, -ENODEV, "Please provide \"phy-handle\"\n");



	err = of_property_read_u32(np, "reg", &phy_id);

	of_node_put(np);

	if (err)

		return dev_err_probe(&pdev->dev, -ENOENT, "Failed to locate \"phy_id\"\n");



	dev = alloc_etherdev(sizeof(struct ep93xx_priv));

	if (dev == NULL) {

		err = -ENOMEM;

		goto err_out;

	}



	eth_hw_addr_set(dev, base_addr + 0x50);

	dev->ethtool_ops = &ep93xx_ethtool_ops;

	dev->netdev_ops = &ep93xx_netdev_ops;

	dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM;



	ep = netdev_priv(dev);

	ep->dev = dev;

	SET_NETDEV_DEV(dev, &pdev->dev);
@@ -822,15 +822,10 @@ static int ep93xx_eth_probe(struct platform_device *pdev) 
		goto err_out;

	}



	ep->base_addr = ioremap(mem->start, resource_size(mem));

	if (ep->base_addr == NULL) {

		dev_err(&pdev->dev, "Failed to ioremap ethernet registers\n");

		err = -EIO;

		goto err_out;

	}

	ep->base_addr = base_addr;

	ep->irq = irq;



	ep->mii.phy_id = data->phy_id;

	ep->mii.phy_id = phy_id;

	ep->mii.phy_id_mask = 0x1f;

	ep->mii.reg_num_mask = 0x1f;

	ep->mii.dev = dev;
@@ -857,12 +852,18 @@ static int ep93xx_eth_probe(struct platform_device *pdev) 
	return err;

}



static const struct of_device_id ep93xx_eth_of_ids[] = {

	{ .compatible = "cirrus,ep9301-eth" },

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, ep93xx_eth_of_ids);



static struct platform_driver ep93xx_eth_driver = {

	.probe		= ep93xx_eth_probe,

	.remove_new	= ep93xx_eth_remove,

	.driver		= {

		.name	= "ep93xx-eth",

		.of_match_table = ep93xx_eth_of_ids,

	},

};