diff options
Diffstat (limited to 'debian/patches/bugfix/all/disable-some-marvell-phys.patch')
| -rw-r--r-- | debian/patches/bugfix/all/disable-some-marvell-phys.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/debian/patches/bugfix/all/disable-some-marvell-phys.patch b/debian/patches/bugfix/all/disable-some-marvell-phys.patch index 472e54ce5b..80a1d58ac0 100644 --- a/debian/patches/bugfix/all/disable-some-marvell-phys.patch +++ b/debian/patches/bugfix/all/disable-some-marvell-phys.patch @@ -16,7 +16,7 @@ correctness. --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c -@@ -1320,6 +1320,7 @@ static int m88e1118_config_init(struct phy_device *phydev) +@@ -1366,6 +1366,7 @@ static int m88e1118_config_init(struct p return genphy_soft_reset(phydev); } @@ -24,7 +24,7 @@ correctness. static int m88e1149_config_init(struct phy_device *phydev) { int err; -@@ -1345,7 +1346,9 @@ static int m88e1149_config_init(struct phy_device *phydev) +@@ -1391,7 +1392,9 @@ static int m88e1149_config_init(struct p return genphy_soft_reset(phydev); } @@ -34,7 +34,7 @@ correctness. static int m88e1145_config_init_rgmii(struct phy_device *phydev) { int err; -@@ -1423,6 +1426,7 @@ static int m88e1145_config_init(struct phy_device *phydev) +@@ -1469,6 +1472,7 @@ static int m88e1145_config_init(struct p return 0; } @@ -42,7 +42,7 @@ correctness. static int m88e1540_get_fld(struct phy_device *phydev, u8 *msecs) { -@@ -3414,6 +3418,7 @@ static struct phy_driver marvell_drivers[] = { +@@ -3790,6 +3794,7 @@ static struct phy_driver marvell_drivers .led_hw_control_set = m88e1318_led_hw_control_set, .led_hw_control_get = m88e1318_led_hw_control_get, }, @@ -50,16 +50,16 @@ correctness. { .phy_id = MARVELL_PHY_ID_88E1145, .phy_id_mask = MARVELL_PHY_ID_MASK, -@@ -3434,6 +3439,8 @@ static struct phy_driver marvell_drivers[] = { - .get_tunable = m88e1111_get_tunable, - .set_tunable = m88e1111_set_tunable, +@@ -3813,6 +3818,8 @@ static struct phy_driver marvell_drivers + .cable_test_start = m88e1111_vct_cable_test_start, + .cable_test_get_status = m88e1111_vct_cable_test_get_status, }, +#endif +#if 0 { .phy_id = MARVELL_PHY_ID_88E1149R, .phy_id_mask = MARVELL_PHY_ID_MASK, -@@ -3452,6 +3459,8 @@ static struct phy_driver marvell_drivers[] = { +@@ -3831,6 +3838,8 @@ static struct phy_driver marvell_drivers .get_strings = marvell_get_strings, .get_stats = marvell_get_stats, }, @@ -68,7 +68,7 @@ correctness. { .phy_id = MARVELL_PHY_ID_88E1240, .phy_id_mask = MARVELL_PHY_ID_MASK, -@@ -3472,6 +3481,7 @@ static struct phy_driver marvell_drivers[] = { +@@ -3851,6 +3860,7 @@ static struct phy_driver marvell_drivers .get_tunable = m88e1011_get_tunable, .set_tunable = m88e1011_set_tunable, }, @@ -76,7 +76,7 @@ correctness. { .phy_id = MARVELL_PHY_ID_88E1116R, .phy_id_mask = MARVELL_PHY_ID_MASK, -@@ -3744,9 +4074,9 @@ static struct mdio_device_id __maybe_unused marvell_tbl[] = { +@@ -4139,9 +4149,9 @@ static struct mdio_device_id __maybe_unu { MARVELL_PHY_ID_88E1111_FINISAR, MARVELL_PHY_ID_MASK }, { MARVELL_PHY_ID_88E1118, MARVELL_PHY_ID_MASK }, { MARVELL_PHY_ID_88E1121R, MARVELL_PHY_ID_MASK }, |