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

Commit 43d3ddf8 authored by Antoine Tenart's avatar Antoine Tenart Committed by David S. Miller
Browse files

net: pxa168_eth: add device tree support 



Add the device tree support to the pxa168_eth driver.

Signed-off-by: default avatarAntoine Tenart <antoine.tenart@free-electrons.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 307f6565

drivers/net/ethernet/marvell/pxa168_eth.c

+47 −23
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ struct tx_desc { 


struct pxa168_eth_private {

	int port_num;		/* User Ethernet port number    */

	int phy_addr;



	int rx_resource_err;	/* Rx ring resource error flag */
@@ -1360,24 +1361,25 @@ static struct phy_device *phy_scan(struct pxa168_eth_private *pep, int phy_addr) 
	return phydev;

}



static void phy_init(struct pxa168_eth_private *pep, int speed, int duplex)

static void phy_init(struct pxa168_eth_private *pep)

{

	struct phy_device *phy = pep->phy;



	phy_attach(pep->dev, dev_name(&phy->dev), PHY_INTERFACE_MODE_MII);



	if (speed == 0) {

	if (pep->pd && pep->pd->speed != 0) {

		phy->autoneg = AUTONEG_DISABLE;

		phy->advertising = 0;

		phy->speed = pep->pd->speed;

		phy->duplex = pep->pd->duplex;

	} else {

		phy->autoneg = AUTONEG_ENABLE;

		phy->speed = 0;

		phy->duplex = 0;

		phy->supported &= PHY_BASIC_FEATURES;

		phy->advertising = phy->supported | ADVERTISED_Autoneg;

	} else {

		phy->autoneg = AUTONEG_DISABLE;

		phy->advertising = 0;

		phy->speed = speed;

		phy->duplex = duplex;

	}



	phy_start_aneg(phy);

}
@@ -1385,11 +1387,13 @@ static int ethernet_phy_setup(struct net_device *dev) 
{

	struct pxa168_eth_private *pep = netdev_priv(dev);



	if (pep->pd->init)

	if (pep->pd && pep->pd->init)

		pep->pd->init();

	pep->phy = phy_scan(pep, pep->pd->phy_addr & 0x1f);



	pep->phy = phy_scan(pep, pep->phy_addr & 0x1f);

	if (pep->phy != NULL)

		phy_init(pep, pep->pd->speed, pep->pd->duplex);

		phy_init(pep);



	update_hash_table_mac_address(pep, NULL, dev->dev_addr);



	return 0;
@@ -1449,16 +1453,17 @@ static int pxa168_eth_probe(struct platform_device *pdev) 
	struct net_device *dev = NULL;

	struct resource *res;

	struct clk *clk;

	struct device_node *np;

	int err;



	printk(KERN_NOTICE "PXA168 10/100 Ethernet Driver\n");



	clk = clk_get(&pdev->dev, "MFUCLK");

	clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(clk)) {

		dev_err(&pdev->dev, "Fast Ethernet failed to get clock\n");

		return -ENODEV;

	}

	clk_enable(clk);

	clk_prepare_enable(clk);



	dev = alloc_etherdev(sizeof(struct pxa168_eth_private));

	if (!dev) {
@@ -1475,8 +1480,8 @@ static int pxa168_eth_probe(struct platform_device *pdev) 
		err = -ENODEV;

		goto err_netdev;

	}

	pep->base = ioremap(res->start, resource_size(res));

	if (pep->base == NULL) {

	pep->base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(pep->base)) {

		err = -ENOMEM;

		goto err_netdev;

	}
@@ -1493,16 +1498,28 @@ static int pxa168_eth_probe(struct platform_device *pdev) 
	dev_info(&pdev->dev, "Using random mac address\n");

	eth_hw_addr_random(dev);



	pep->pd = dev_get_platdata(&pdev->dev);

	pep->rx_ring_size = NUM_RX_DESCS;

	pep->tx_ring_size = NUM_TX_DESCS;



	pep->pd = dev_get_platdata(&pdev->dev);

	if (pep->pd) {

		if (pep->pd->rx_queue_size)

			pep->rx_ring_size = pep->pd->rx_queue_size;



	pep->tx_ring_size = NUM_TX_DESCS;

		if (pep->pd->tx_queue_size)

			pep->tx_ring_size = pep->pd->tx_queue_size;



		pep->port_num = pep->pd->port_number;

		pep->phy_addr = pep->pd->phy_addr;

	} else if (pdev->dev.of_node) {

		of_property_read_u32(pdev->dev.of_node, "port-id",

				     &pep->port_num);



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

		if (np)

			of_property_read_u32(np, "reg", &pep->phy_addr);

	}



	/* Hardware supports only 3 ports */

	BUG_ON(pep->port_num > 2);

	netif_napi_add(dev, &pep->napi, pxa168_rx_poll, pep->rx_ring_size);
@@ -1603,6 +1620,12 @@ static int pxa168_eth_suspend(struct platform_device *pdev, pm_message_t state) 
#define pxa168_eth_suspend NULL

#endif



static const struct of_device_id pxa168_eth_of_match[] = {

	{ .compatible = "marvell,pxa168-eth" },

	{ },

};

MODULE_DEVICE_TABLE(of, pxa168_eth_of_match);



static struct platform_driver pxa168_eth_driver = {

	.probe = pxa168_eth_probe,

	.remove = pxa168_eth_remove,
@@ -1611,6 +1634,7 @@ static struct platform_driver pxa168_eth_driver = { 
	.suspend = pxa168_eth_suspend,

	.driver = {

		.name		= DRIVER_NAME,

		.of_match_table	= of_match_ptr(pxa168_eth_of_match),

	},

};