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

Commit 39cebdb7 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarIyappan Subramanian <isubramanian@apm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b1357cfb f098003a

drivers/net/ethernet/apm/xgene/xgene_enet_hw.c

+2 −5
Original line number Diff line number Diff line
@@ -468,7 +468,6 @@ static void xgene_enet_configure_clock(struct xgene_enet_pdata *pdata) 


static void xgene_gmac_set_speed(struct xgene_enet_pdata *pdata)

{

	struct device *dev = &pdata->pdev->dev;

	u32 icm0, icm2, mc2;

	u32 intf_ctl, rgmii, value;
@@ -500,10 +499,8 @@ static void xgene_gmac_set_speed(struct xgene_enet_pdata *pdata) 
		intf_ctl |= ENET_GHD_MODE;

		CFG_MACMODE_SET(&icm0, 2);

		CFG_WAITASYNCRD_SET(&icm2, 0);

		if (dev->of_node) {

		CFG_TXCLK_MUXSEL0_SET(&rgmii, pdata->tx_delay);

		CFG_RXCLK_MUXSEL0_SET(&rgmii, pdata->rx_delay);

		}

		rgmii |= CFG_SPEED_1250;



		xgene_enet_rd_csr(pdata, DEBUG_REG_ADDR, &value);

drivers/net/ethernet/apm/xgene/xgene_enet_main.c

+2 −4
Original line number Diff line number Diff line
@@ -1591,7 +1591,7 @@ static int xgene_get_tx_delay(struct xgene_enet_pdata *pdata) 
	struct device *dev = &pdata->pdev->dev;

	int delay, ret;



	ret = of_property_read_u32(dev->of_node, "tx-delay", &delay);

	ret = device_property_read_u32(dev, "tx-delay", &delay);

	if (ret) {

		pdata->tx_delay = 4;

		return 0;
@@ -1612,7 +1612,7 @@ static int xgene_get_rx_delay(struct xgene_enet_pdata *pdata) 
	struct device *dev = &pdata->pdev->dev;

	int delay, ret;



	ret = of_property_read_u32(dev->of_node, "rx-delay", &delay);

	ret = device_property_read_u32(dev, "rx-delay", &delay);

	if (ret) {

		pdata->rx_delay = 2;

		return 0;
@@ -1674,8 +1674,6 @@ static void xgene_enet_check_phy_handle(struct xgene_enet_pdata *pdata) 
	ret = xgene_enet_phy_connect(pdata->ndev);

	if (!ret)

		pdata->mdio_driver = true;



	return;

}



static void xgene_enet_gpiod_get(struct xgene_enet_pdata *pdata)