aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-4.9/703-phy-support-layerscape.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/layerscape/patches-4.9/703-phy-support-layerscape.patch')
-rw-r--r--target/linux/layerscape/patches-4.9/703-phy-support-layerscape.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/layerscape/patches-4.9/703-phy-support-layerscape.patch b/target/linux/layerscape/patches-4.9/703-phy-support-layerscape.patch
index 197fd9c50f..acc75cdc2c 100644
--- a/target/linux/layerscape/patches-4.9/703-phy-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.9/703-phy-support-layerscape.patch
@@ -1618,7 +1618,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
.config_intr = &marvell_config_intr,
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
-@@ -585,7 +585,7 @@ int phy_mii_ioctl(struct phy_device *phy
+@@ -591,7 +591,7 @@ int phy_mii_ioctl(struct phy_device *phy
return 0;
case SIOCSHWTSTAMP:
@@ -1627,7 +1627,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
return phydev->drv->hwtstamp(phydev, ifr);
/* fall through */
-@@ -610,6 +610,9 @@ static int phy_start_aneg_priv(struct ph
+@@ -616,6 +616,9 @@ static int phy_start_aneg_priv(struct ph
bool trigger = 0;
int err;
@@ -1637,7 +1637,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
mutex_lock(&phydev->lock);
if (AUTONEG_DISABLE == phydev->autoneg)
-@@ -1009,7 +1012,7 @@ void phy_state_machine(struct work_struc
+@@ -1015,7 +1018,7 @@ void phy_state_machine(struct work_struc
old_state = phydev->state;
@@ -1646,7 +1646,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
phydev->drv->link_change_notify(phydev);
switch (phydev->state) {
-@@ -1311,6 +1314,9 @@ EXPORT_SYMBOL(phy_write_mmd_indirect);
+@@ -1317,6 +1320,9 @@ EXPORT_SYMBOL(phy_write_mmd_indirect);
*/
int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable)
{
@@ -1656,7 +1656,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
/* According to 802.3az,the EEE is supported only in full duplex-mode.
* Also EEE feature is active when core is operating with MII, GMII
* or RGMII (all kinds). Internal PHYs are also allowed to proceed and
-@@ -1388,6 +1394,9 @@ EXPORT_SYMBOL(phy_init_eee);
+@@ -1394,6 +1400,9 @@ EXPORT_SYMBOL(phy_init_eee);
*/
int phy_get_eee_err(struct phy_device *phydev)
{
@@ -1666,7 +1666,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
return phy_read_mmd_indirect(phydev, MDIO_PCS_EEE_WK_ERR, MDIO_MMD_PCS);
}
EXPORT_SYMBOL(phy_get_eee_err);
-@@ -1404,6 +1413,9 @@ int phy_ethtool_get_eee(struct phy_devic
+@@ -1410,6 +1419,9 @@ int phy_ethtool_get_eee(struct phy_devic
{
int val;
@@ -1676,7 +1676,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
/* Get Supported EEE */
val = phy_read_mmd_indirect(phydev, MDIO_PCS_EEE_ABLE, MDIO_MMD_PCS);
if (val < 0)
-@@ -1437,6 +1449,9 @@ int phy_ethtool_set_eee(struct phy_devic
+@@ -1443,6 +1455,9 @@ int phy_ethtool_set_eee(struct phy_devic
{
int val = ethtool_adv_to_mmd_eee_adv_t(data->advertised);
@@ -1686,7 +1686,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
/* Mask prohibited EEE modes */
val &= ~phydev->eee_broken_modes;
-@@ -1448,7 +1463,7 @@ EXPORT_SYMBOL(phy_ethtool_set_eee);
+@@ -1454,7 +1469,7 @@ EXPORT_SYMBOL(phy_ethtool_set_eee);
int phy_ethtool_set_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol)
{
@@ -1695,7 +1695,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
return phydev->drv->set_wol(phydev, wol);
return -EOPNOTSUPP;
-@@ -1457,7 +1472,7 @@ EXPORT_SYMBOL(phy_ethtool_set_wol);
+@@ -1463,7 +1478,7 @@ EXPORT_SYMBOL(phy_ethtool_set_wol);
void phy_ethtool_get_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol)
{