tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'xgene-Misc-bug-fixes'

Iyappan Subramanian says:

====================
drivers: net: xgene: Misc bug fixes

This patch set fixes bugs related to handling the case for ACPI for,
reading and programming tx/rx delay values.
====================

Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

David S. Miller 39cebdb7 b1357cfb

+4 -9
+2 -5
drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
··· 468 468 469 469 static void xgene_gmac_set_speed(struct xgene_enet_pdata *pdata) 470 470 { 471 - struct device *dev = &pdata->pdev->dev; 472 471 u32 icm0, icm2, mc2; 473 472 u32 intf_ctl, rgmii, value; 474 473 ··· 499 500 intf_ctl |= ENET_GHD_MODE; 500 501 CFG_MACMODE_SET(&icm0, 2); 501 502 CFG_WAITASYNCRD_SET(&icm2, 0); 502 - if (dev->of_node) { 503 - CFG_TXCLK_MUXSEL0_SET(&rgmii, pdata->tx_delay); 504 - CFG_RXCLK_MUXSEL0_SET(&rgmii, pdata->rx_delay); 505 - } 503 + CFG_TXCLK_MUXSEL0_SET(&rgmii, pdata->tx_delay); 504 + CFG_RXCLK_MUXSEL0_SET(&rgmii, pdata->rx_delay); 506 505 rgmii |= CFG_SPEED_1250; 507 506 508 507 xgene_enet_rd_csr(pdata, DEBUG_REG_ADDR, &value);
+2 -4
drivers/net/ethernet/apm/xgene/xgene_enet_main.c
··· 1591 1591 struct device *dev = &pdata->pdev->dev; 1592 1592 int delay, ret; 1593 1593 1594 - ret = of_property_read_u32(dev->of_node, "tx-delay", &delay); 1594 + ret = device_property_read_u32(dev, "tx-delay", &delay); 1595 1595 if (ret) { 1596 1596 pdata->tx_delay = 4; 1597 1597 return 0; ··· 1612 1612 struct device *dev = &pdata->pdev->dev; 1613 1613 int delay, ret; 1614 1614 1615 - ret = of_property_read_u32(dev->of_node, "rx-delay", &delay); 1615 + ret = device_property_read_u32(dev, "rx-delay", &delay); 1616 1616 if (ret) { 1617 1617 pdata->rx_delay = 2; 1618 1618 return 0; ··· 1674 1674 ret = xgene_enet_phy_connect(pdata->ndev); 1675 1675 if (!ret) 1676 1676 pdata->mdio_driver = true; 1677 - 1678 - return; 1679 1677 } 1680 1678 1681 1679 static void xgene_enet_gpiod_get(struct xgene_enet_pdata *pdata)