fix up net phy patch

diff --git a/queue-4.14/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch b/queue-4.14/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch
index 3a9a209e4011f9641bdddd185c8f2363c8e35c4b..42252301d75c239b3a9768b9d98bcd0a2270460d 100644 (file)
--- a/queue-4.14/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch
+++ b/queue-4.14/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch
@@ -90,10 +90,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  static int ksz9021_load_values_from_of(struct phy_device *phydev,
                                       const struct device_node *of_node,
                                       u16 reg,
-@@ -799,7 +810,7 @@ static struct phy_driver ksphy_driver[]
+@@ -938,7 +949,7 @@ static struct phy_driver ksphy_driver[]
+       .phy_id_mask    = MICREL_PHY_ID_MASK,
        .features       = PHY_BASIC_FEATURES,
        .flags          = PHY_HAS_INTERRUPT,
-       .driver_data    = &ks8737_type,
 -      .config_init    = kszphy_config_init,
 +      .config_init    = ksz8061_config_init,
        .config_aneg    = genphy_config_aneg,

diff --git a/queue-4.19/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch b/queue-4.19/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch
index f4b41c814ddde77798713960d1c195c18f98c65d..e8a569891f9a631b307d5b978bc592b16e0606c6 100644 (file)
--- a/queue-4.19/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch
+++ b/queue-4.19/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch
@@ -90,10 +90,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  static int ksz9021_load_values_from_of(struct phy_device *phydev,
                                       const struct device_node *of_node,
                                       u16 reg,
-@@ -810,7 +821,7 @@ static struct phy_driver ksphy_driver[]
+@@ -934,7 +945,7 @@ static struct phy_driver ksphy_driver[]
+       .phy_id_mask    = MICREL_PHY_ID_MASK,
        .features       = PHY_BASIC_FEATURES,
        .flags          = PHY_HAS_INTERRUPT,
-       .driver_data    = &ks8737_type,
 -      .config_init    = kszphy_config_init,
 +      .config_init    = ksz8061_config_init,
        .ack_interrupt  = kszphy_ack_interrupt,

diff --git a/queue-4.20/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch b/queue-4.20/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch
index 2c48a769287f9eb2252c36eee14f8800f6502e61..92697cc08f858c5df36f563a9517e8264b0b5132 100644 (file)
--- a/queue-4.20/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch
+++ b/queue-4.20/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch
@@ -90,10 +90,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  static int ksz9021_load_values_from_of(struct phy_device *phydev,
                                       const struct device_node *of_node,
                                       u16 reg,
-@@ -920,7 +931,7 @@ static struct phy_driver ksphy_driver[]
+@@ -1044,7 +1055,7 @@ static struct phy_driver ksphy_driver[]
+       .phy_id_mask    = MICREL_PHY_ID_MASK,
        .features       = PHY_BASIC_FEATURES,
        .flags          = PHY_HAS_INTERRUPT,
-       .driver_data    = &ks8737_type,
 -      .config_init    = kszphy_config_init,
 +      .config_init    = ksz8061_config_init,
        .ack_interrupt  = kszphy_ack_interrupt,

diff --git a/queue-4.4/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch b/queue-4.4/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch
index 39e89acee64084fc4d2242887715f47e22aba5cc..3a4bc91e2aa8afecd9cb18168f6697e8aee6571c 100644 (file)
--- a/queue-4.4/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch
+++ b/queue-4.4/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch
@@ -98,10 +98,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  static int ksz9021_load_values_from_of(struct phy_device *phydev,
                                       const struct device_node *of_node,
                                       u16 reg,
-@@ -640,7 +652,7 @@ static struct phy_driver ksphy_driver[]
+@@ -771,7 +783,7 @@ static struct phy_driver ksphy_driver[]
+       .phy_id_mask    = 0x00fffff0,
        .features       = (PHY_BASIC_FEATURES | SUPPORTED_Pause),
        .flags          = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
-       .driver_data    = &ks8737_type,
 -      .config_init    = kszphy_config_init,
 +      .config_init    = ksz8061_config_init,
        .config_aneg    = genphy_config_aneg,

diff --git a/queue-4.9/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch b/queue-4.9/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch
index 804530fdb211c5d2d5554570ac1784c4b890a0f2..5589a4810113f884d13ae05be5e4370ead48edb2 100644 (file)
--- a/queue-4.9/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch
+++ b/queue-4.9/net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch
@@ -90,10 +90,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  static int ksz9021_load_values_from_of(struct phy_device *phydev,
                                       const struct device_node *of_node,
                                       u16 reg,
-@@ -796,7 +807,7 @@ static struct phy_driver ksphy_driver[]
+@@ -940,7 +951,7 @@ static struct phy_driver ksphy_driver[]
+       .phy_id_mask    = MICREL_PHY_ID_MASK,
        .features       = (PHY_BASIC_FEATURES | SUPPORTED_Pause),
        .flags          = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
-       .driver_data    = &ks8737_type,
 -      .config_init    = kszphy_config_init,
 +      .config_init    = ksz8061_config_init,
        .config_aneg    = genphy_config_aneg,