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

Merge branch 'qcom-emac-various-minor-improvements' 



Timur Tabi says:

====================
net: qcom/emac: various minor improvements

A collection of minor fixes and features to the Qualcomm Technologies
EMAC network driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e3c42b61 ceef551f

drivers/net/ethernet/qualcomm/emac/emac-sgmii.c

+21 −2
Original line number Diff line number Diff line
@@ -297,6 +297,14 @@ static const struct of_device_id emac_sgmii_dt_match[] = { 
	{}

};



/* Dummy function for systems without an internal PHY. This avoids having

 * to check for NULL pointers before calling the functions.

 */

static int emac_sgmii_dummy(struct emac_adapter *adpt)

{

	return 0;

}



int emac_sgmii_config(struct platform_device *pdev, struct emac_adapter *adpt)

{

	struct platform_device *sgmii_pdev = NULL;
@@ -311,8 +319,19 @@ int emac_sgmii_config(struct platform_device *pdev, struct emac_adapter *adpt) 
					emac_sgmii_acpi_match);



		if (!dev) {

			dev_err(&pdev->dev, "cannot find internal phy node\n");

			return -ENODEV;

			dev_warn(&pdev->dev, "cannot find internal phy node\n");

			/* There is typically no internal PHY on emulation

			 * systems, so if we can't find the node, assume

			 * we are on an emulation system and stub-out

			 * support for the internal PHY.  These systems only

			 * use ACPI.

			 */

			phy->open = emac_sgmii_dummy;

			phy->close = emac_sgmii_dummy;

			phy->link_up = emac_sgmii_dummy;

			phy->link_down = emac_sgmii_dummy;



			return 0;

		}



		sgmii_pdev = to_platform_device(dev);

drivers/net/ethernet/qualcomm/emac/emac.c

+14 −2
Original line number Diff line number Diff line
@@ -683,8 +683,6 @@ static int emac_probe(struct platform_device *pdev) 
		goto err_undo_mdiobus;

	}



	emac_mac_reset(adpt);



	/* set hw features */

	netdev->features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_RXCSUM |

			NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_HW_VLAN_CTAG_RX |
@@ -762,6 +760,19 @@ static int emac_remove(struct platform_device *pdev) 
	return 0;

}



static void emac_shutdown(struct platform_device *pdev)

{

	struct net_device *netdev = dev_get_drvdata(&pdev->dev);

	struct emac_adapter *adpt = netdev_priv(netdev);

	struct emac_sgmii *sgmii = &adpt->phy;



	/* Closing the SGMII turns off its interrupts */

	sgmii->close(adpt);



	/* Resetting the MAC turns off all DMA and its interrupts */

	emac_mac_reset(adpt);

}



static struct platform_driver emac_platform_driver = {

	.probe	= emac_probe,

	.remove	= emac_remove,
@@ -770,6 +781,7 @@ static struct platform_driver emac_platform_driver = { 
		.of_match_table = emac_dt_match,

		.acpi_match_table = ACPI_PTR(emac_acpi_match),

	},

	.shutdown = emac_shutdown,

};



module_platform_driver(emac_platform_driver);