realtek: refresh patches

Make the patches apply cleanly again.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/realtek/patches-6.18/714-net-phy-sfp-add-support-for-SMBus.patch b/target/linux/realtek/patches-6.18/714-net-phy-sfp-add-support-for-SMBus.patch
index 20309d5ad832d45f0f59c4b8b07be27dc6cb4849..390ffabb9906b97ca086fbf9b35ba1fe573c6f48 100644 (file)
--- a/target/linux/realtek/patches-6.18/714-net-phy-sfp-add-support-for-SMBus.patch
+++ b/target/linux/realtek/patches-6.18/714-net-phy-sfp-add-support-for-SMBus.patch
@@ -10,7 +10,7 @@ Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
 
 --- a/drivers/net/phy/sfp.c
 +++ b/drivers/net/phy/sfp.c
-@@ -866,6 +866,29 @@ static int sfp_i2c_mdiobus_create(struct
+@@ -850,6 +850,29 @@ static int sfp_i2c_mdiobus_create(struct
        return 0;
  }
  
@@ -40,7 +40,7 @@ Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
  static void sfp_i2c_mdiobus_destroy(struct sfp *sfp)
  {
        mdiobus_unregister(sfp->i2c_mii);
-@@ -2040,9 +2063,15 @@ static void sfp_sm_fault(struct sfp *sfp
+@@ -2024,9 +2047,15 @@ static void sfp_sm_fault(struct sfp *sfp
  
  static int sfp_sm_add_mdio_bus(struct sfp *sfp)
  {

diff --git a/target/linux/realtek/patches-6.18/741-net-sfp-apply-I2C-adapter-quirks-to-limit-blocks.patch b/target/linux/realtek/patches-6.18/741-net-sfp-apply-I2C-adapter-quirks-to-limit-blocks.patch
index 23b83f7b6b16b3b6edbde1e792f0b5d9e74b4e43..7e575141d2de56841b5ebc30a839337dea2e5d16 100644 (file)
--- a/target/linux/realtek/patches-6.18/741-net-sfp-apply-I2C-adapter-quirks-to-limit-blocks.patch
+++ b/target/linux/realtek/patches-6.18/741-net-sfp-apply-I2C-adapter-quirks-to-limit-blocks.patch
@@ -25,7 +25,7 @@ Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
 
 --- a/drivers/net/phy/sfp.c
 +++ b/drivers/net/phy/sfp.c
-@@ -825,21 +825,29 @@ static int sfp_smbus_byte_write(struct s
+@@ -809,21 +809,29 @@ static int sfp_smbus_byte_write(struct s
  
  static int sfp_i2c_configure(struct sfp *sfp, struct i2c_adapter *i2c)
  {

diff --git a/target/linux/realtek/patches-6.18/742-net-sfp-extend-SMBus-support.patch b/target/linux/realtek/patches-6.18/742-net-sfp-extend-SMBus-support.patch
index dd40d7ba58ce5f40647fd9397a5491099c8f980a..da9498967064ff9962000fc132dfe9eee6ef8010 100644 (file)
--- a/target/linux/realtek/patches-6.18/742-net-sfp-extend-SMBus-support.patch
+++ b/target/linux/realtek/patches-6.18/742-net-sfp-extend-SMBus-support.patch
@@ -42,7 +42,7 @@ Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
  #include <linux/workqueue.h>
  
  #include "sfp.h"
-@@ -774,50 +775,101 @@ static int sfp_i2c_write(struct sfp *sfp
+@@ -758,50 +759,101 @@ static int sfp_i2c_write(struct sfp *sfp
        return ret == ARRAY_SIZE(msgs) ? len : 0;
  }
  
@@ -164,7 +164,7 @@ Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
        }
  
        return data - (u8 *)buf;
-@@ -826,17 +878,32 @@ static int sfp_smbus_byte_write(struct s
+@@ -810,17 +862,32 @@ static int sfp_smbus_byte_write(struct s
  static int sfp_i2c_configure(struct sfp *sfp, struct i2c_adapter *i2c)
  {
        size_t max_block_size;