generic: 6.12: sync Realtek PHY patches with upstream

- Fix order of patches (3d483a10327f was merged before 34d5a86ff7bb).
- Reorganize patch numbers now that < 6.12 patches are no longer needed.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

19 files changed, 8 insertions, 16 deletions

diff --git a/target/linux/generic/backport-6.12/781-15-v6.13-net-phy-realtek-read-duplex-and-gbit-master-from-PHY.patch b/target/linux/generic/backport-6.12/781-01-v6.13-net-phy-realtek-read-duplex-and-gbit-master-from-PHY.patch
index e15218b169..2a1726ac80 100644
--- a/target/linux/generic/backport-6.12/781-15-v6.13-net-phy-realtek-read-duplex-and-gbit-master-from-PHY.patch
+++ b/target/linux/generic/backport-6.12/781-01-v6.13-net-phy-realtek-read-duplex-and-gbit-master-from-PHY.patch
@@ -1,7 +1,7 @@
 From 081c9c0265c91b8333165aa6230c20bcbc6f7cbf Mon Sep 17 00:00:00 2001
 From: Daniel Golle <daniel@makrotopia.org>
 Date: Thu, 10 Oct 2024 14:07:16 +0100
-Subject: [PATCH 3/5] net: phy: realtek: read duplex and gbit master from PHYSR
+Subject: [PATCH] net: phy: realtek: read duplex and gbit master from PHYSR
  register
 
 The PHYSR MMD register is present and defined equally for all RTL82xx
diff --git a/target/linux/generic/backport-6.12/781-16-v6.13-net-phy-realtek-change-order-of-calls-in-C22-read_st.patch b/target/linux/generic/backport-6.12/781-02-v6.13-net-phy-realtek-change-order-of-calls-in-C22-read_st.patch
index be7136b375..4341adb878 100644
--- a/target/linux/generic/backport-6.12/781-16-v6.13-net-phy-realtek-change-order-of-calls-in-C22-read_st.patch
+++ b/target/linux/generic/backport-6.12/781-02-v6.13-net-phy-realtek-change-order-of-calls-in-C22-read_st.patch
@@ -1,8 +1,7 @@
 From 68d5cd09e8919679ce13b85950debea4b2e98e04 Mon Sep 17 00:00:00 2001
 From: Daniel Golle <daniel@makrotopia.org>
 Date: Thu, 10 Oct 2024 14:07:26 +0100
-Subject: [PATCH 4/5] net: phy: realtek: change order of calls in C22
- read_status()
+Subject: [PATCH] net: phy: realtek: change order of calls in C22 read_status()
 
 Always call rtlgen_read_status() first, so genphy_read_status() which
 is called by it clears bits in case auto-negotiation has not completed.
diff --git a/target/linux/generic/backport-6.12/781-17-v6.13-net-phy-realtek-clear-1000Base-T-link-partner-advert.patch b/target/linux/generic/backport-6.12/781-03-v6.13-net-phy-realtek-clear-1000Base-T-link-partner-advert.patch
index 3847d5803a..60cd125a22 100644
--- a/target/linux/generic/backport-6.12/781-17-v6.13-net-phy-realtek-clear-1000Base-T-link-partner-advert.patch
+++ b/target/linux/generic/backport-6.12/781-03-v6.13-net-phy-realtek-clear-1000Base-T-link-partner-advert.patch
@@ -1,7 +1,7 @@
 From 5cb409b3960e75467cbb0a8e1e5596b4490570e3 Mon Sep 17 00:00:00 2001
 From: Daniel Golle <daniel@makrotopia.org>
 Date: Thu, 10 Oct 2024 14:07:39 +0100
-Subject: [PATCH 5/5] net: phy: realtek: clear 1000Base-T link partner
+Subject: [PATCH] net: phy: realtek: clear 1000Base-T link partner
  advertisement
 
 Clear 1000Base-T link partner advertisement bits in Clause-45
diff --git a/target/linux/generic/backport-6.12/781-18-v6.13-net-phy-realtek-merge-the-drivers-for-internal-NBase.patch b/target/linux/generic/backport-6.12/781-04-v6.13-net-phy-realtek-merge-the-drivers-for-internal-NBase.patch
index 771f60df91..771f60df91 100644
--- a/target/linux/generic/backport-6.12/781-18-v6.13-net-phy-realtek-merge-the-drivers-for-internal-NBase.patch
+++ b/target/linux/generic/backport-6.12/781-04-v6.13-net-phy-realtek-merge-the-drivers-for-internal-NBase.patch
diff --git a/target/linux/generic/backport-6.12/781-19-v6.13-net-phy-realtek-add-RTL8125D-internal-PHY.patch b/target/linux/generic/backport-6.12/781-05-v6.13-net-phy-realtek-add-RTL8125D-internal-PHY.patch
index 4b9b9e8d48..4b9b9e8d48 100644
--- a/target/linux/generic/backport-6.12/781-19-v6.13-net-phy-realtek-add-RTL8125D-internal-PHY.patch
+++ b/target/linux/generic/backport-6.12/781-05-v6.13-net-phy-realtek-add-RTL8125D-internal-PHY.patch
diff --git a/target/linux/generic/backport-6.12/781-23-v6.14-net-phy-realtek-add-support-for-reading-MDIO_MMD_VEN.patch b/target/linux/generic/backport-6.12/781-06-v6.14-net-phy-realtek-add-support-for-reading-MDIO_MMD_VEN.patch
index 2add672f44..2add672f44 100644
--- a/target/linux/generic/backport-6.12/781-23-v6.14-net-phy-realtek-add-support-for-reading-MDIO_MMD_VEN.patch
+++ b/target/linux/generic/backport-6.12/781-06-v6.14-net-phy-realtek-add-support-for-reading-MDIO_MMD_VEN.patch
diff --git a/target/linux/generic/backport-6.12/781-20-v6.14-net-phy-realtek-clear-1000Base-T-lpa-if-link-is-down.patch b/target/linux/generic/backport-6.12/781-07-v6.14-net-phy-realtek-clear-1000Base-T-lpa-if-link-is-down.patch
index 3e9631e4a3..002b99e4d5 100644
--- a/target/linux/generic/backport-6.12/781-20-v6.14-net-phy-realtek-clear-1000Base-T-lpa-if-link-is-down.patch
+++ b/target/linux/generic/backport-6.12/781-07-v6.14-net-phy-realtek-clear-1000Base-T-lpa-if-link-is-down.patch
@@ -18,7 +18,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/phy/realtek.c
 +++ b/drivers/net/phy/realtek.c
-@@ -1023,23 +1023,20 @@ static int rtl822x_c45_read_status(struc
+@@ -1031,23 +1031,20 @@ static int rtl822x_c45_read_status(struc
  {
  	int ret, val;
  
diff --git a/target/linux/generic/backport-6.12/781-21-v6.14-net-phy-realtek-clear-master_slave_state-if-link-is-.patch b/target/linux/generic/backport-6.12/781-08-v6.14-net-phy-realtek-clear-master_slave_state-if-link-is-.patch
index 778602d3e5..f8cfc4d131 100644
--- a/target/linux/generic/backport-6.12/781-21-v6.14-net-phy-realtek-clear-master_slave_state-if-link-is-.patch
+++ b/target/linux/generic/backport-6.12/781-08-v6.14-net-phy-realtek-clear-master_slave_state-if-link-is-.patch
@@ -21,7 +21,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/phy/realtek.c
 +++ b/drivers/net/phy/realtek.c
-@@ -1038,8 +1038,10 @@ static int rtl822x_c45_read_status(struc
+@@ -1046,8 +1046,10 @@ static int rtl822x_c45_read_status(struc
  	if (ret < 0)
  		return ret;
  
diff --git a/target/linux/generic/backport-6.12/781-22-v6.14-net-phy-realtek-always-clear-NBase-T-lpa.patch b/target/linux/generic/backport-6.12/781-09-v6.14-net-phy-realtek-always-clear-NBase-T-lpa.patch
index d365ed0ad2..e628bed6b4 100644
--- a/target/linux/generic/backport-6.12/781-22-v6.14-net-phy-realtek-always-clear-NBase-T-lpa.patch
+++ b/target/linux/generic/backport-6.12/781-09-v6.14-net-phy-realtek-always-clear-NBase-T-lpa.patch
@@ -21,7 +21,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/phy/realtek.c
 +++ b/drivers/net/phy/realtek.c
-@@ -952,15 +952,15 @@ static int rtl822x_read_status(struct ph
+@@ -960,15 +960,15 @@ static int rtl822x_read_status(struct ph
  {
  	int lpadv, ret;
  
diff --git a/target/linux/generic/backport-6.12/781-24-v6.14-net-phy-move-realtek-PHY-driver-to-its-own-subdirect.patch b/target/linux/generic/backport-6.12/781-10-v6.14-net-phy-move-realtek-PHY-driver-to-its-own-subdirect.patch
index 5f0b61e0ce..5f0b61e0ce 100644
--- a/target/linux/generic/backport-6.12/781-24-v6.14-net-phy-move-realtek-PHY-driver-to-its-own-subdirect.patch
+++ b/target/linux/generic/backport-6.12/781-10-v6.14-net-phy-move-realtek-PHY-driver-to-its-own-subdirect.patch
diff --git a/target/linux/generic/backport-6.12/781-25-v6.14-net-phy-realtek-add-hwmon-support-for-temp-sensor-on.patch b/target/linux/generic/backport-6.12/781-11-v6.14-net-phy-realtek-add-hwmon-support-for-temp-sensor-on.patch
index 7c1fe54267..2dec701028 100644
--- a/target/linux/generic/backport-6.12/781-25-v6.14-net-phy-realtek-add-hwmon-support-for-temp-sensor-on.patch
+++ b/target/linux/generic/backport-6.12/781-11-v6.14-net-phy-realtek-add-hwmon-support-for-temp-sensor-on.patch
@@ -56,7 +56,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 +#endif /* REALTEK_H */
 --- /dev/null
 +++ b/drivers/net/phy/realtek/realtek_hwmon.c
-@@ -0,0 +1,86 @@
+@@ -0,0 +1,79 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
 + * HWMON support for Realtek PHY's
@@ -73,13 +73,6 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 +#define RTL822X_VND2_TSRR				0xbd84
 +#define RTL822X_VND2_TSSR				0xb54c
 +
-+static umode_t rtl822x_hwmon_is_visible(const void *drvdata,
-+				        enum hwmon_sensor_types type,
-+				        u32 attr, int channel)
-+{
-+	return 0444;
-+}
-+
 +static int rtl822x_hwmon_get_temp(int raw)
 +{
 +	if (raw >= 512)
@@ -112,7 +105,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 +}
 +
 +static const struct hwmon_ops rtl822x_hwmon_ops = {
-+	.is_visible = rtl822x_hwmon_is_visible,
++	.visible = 0444,
 +	.read = rtl822x_hwmon_read,
 +};
 +
diff --git a/target/linux/generic/backport-6.12/781-26-v6.14-net-phy-realtek-HWMON-support-for-standalone-version.patch b/target/linux/generic/backport-6.12/781-12-v6.14-net-phy-realtek-HWMON-support-for-standalone-version.patch
index 8b8c97c54f..8b8c97c54f 100644
--- a/target/linux/generic/backport-6.12/781-26-v6.14-net-phy-realtek-HWMON-support-for-standalone-version.patch
+++ b/target/linux/generic/backport-6.12/781-12-v6.14-net-phy-realtek-HWMON-support-for-standalone-version.patch
diff --git a/target/linux/generic/backport-6.12/781-27-v6.15-net-phy-realtek-make-HWMON-support-a-user-visible-Kc.patch b/target/linux/generic/backport-6.12/781-13-v6.15-net-phy-realtek-make-HWMON-support-a-user-visible-Kc.patch
index 821d7ee879..821d7ee879 100644
--- a/target/linux/generic/backport-6.12/781-27-v6.15-net-phy-realtek-make-HWMON-support-a-user-visible-Kc.patch
+++ b/target/linux/generic/backport-6.12/781-13-v6.15-net-phy-realtek-make-HWMON-support-a-user-visible-Kc.patch
diff --git a/target/linux/generic/backport-6.12/781-28-v6.15-net-phy-realtek-use-string-choices-helpers.patch b/target/linux/generic/backport-6.12/781-14-v6.15-net-phy-realtek-use-string-choices-helpers.patch
index d3e09bc7cd..d3e09bc7cd 100644
--- a/target/linux/generic/backport-6.12/781-28-v6.15-net-phy-realtek-use-string-choices-helpers.patch
+++ b/target/linux/generic/backport-6.12/781-14-v6.15-net-phy-realtek-use-string-choices-helpers.patch
diff --git a/target/linux/generic/backport-6.12/781-29-v6.15-net-phy-realtek-improve-mmd-register-access-for-inte.patch b/target/linux/generic/backport-6.12/781-15-v6.15-net-phy-realtek-improve-mmd-register-access-for-inte.patch
index 3a3a20d58b..3a3a20d58b 100644
--- a/target/linux/generic/backport-6.12/781-29-v6.15-net-phy-realtek-improve-mmd-register-access-for-inte.patch
+++ b/target/linux/generic/backport-6.12/781-15-v6.15-net-phy-realtek-improve-mmd-register-access-for-inte.patch
diff --git a/target/linux/generic/backport-6.12/781-30-v6.15-net-phy-realtek-switch-from-paged-to-MMD-ops-in-rtl8.patch b/target/linux/generic/backport-6.12/781-16-v6.15-net-phy-realtek-switch-from-paged-to-MMD-ops-in-rtl8.patch
index 5e3c3ce70a..5e3c3ce70a 100644
--- a/target/linux/generic/backport-6.12/781-30-v6.15-net-phy-realtek-switch-from-paged-to-MMD-ops-in-rtl8.patch
+++ b/target/linux/generic/backport-6.12/781-16-v6.15-net-phy-realtek-switch-from-paged-to-MMD-ops-in-rtl8.patch
diff --git a/target/linux/generic/backport-6.12/781-31-v6.15-net-phy-realtek-add-helper-RTL822X_VND2_C22_REG.patch b/target/linux/generic/backport-6.12/781-17-v6.15-net-phy-realtek-add-helper-RTL822X_VND2_C22_REG.patch
index 5134d08b1c..5134d08b1c 100644
--- a/target/linux/generic/backport-6.12/781-31-v6.15-net-phy-realtek-add-helper-RTL822X_VND2_C22_REG.patch
+++ b/target/linux/generic/backport-6.12/781-17-v6.15-net-phy-realtek-add-helper-RTL822X_VND2_C22_REG.patch
diff --git a/target/linux/generic/backport-6.12/781-32-v6.15-net-phy-realtek-add-defines-for-shadowed-c45-standar.patch b/target/linux/generic/backport-6.12/781-18-v6.15-net-phy-realtek-add-defines-for-shadowed-c45-standar.patch
index ff7d5b1fb6..ff7d5b1fb6 100644
--- a/target/linux/generic/backport-6.12/781-32-v6.15-net-phy-realtek-add-defines-for-shadowed-c45-standar.patch
+++ b/target/linux/generic/backport-6.12/781-18-v6.15-net-phy-realtek-add-defines-for-shadowed-c45-standar.patch
diff --git a/target/linux/generic/backport-6.12/781-33-v6.15-net-phy-realtek-disable-PHY-mode-EEE.patch b/target/linux/generic/backport-6.12/781-19-v6.15-net-phy-realtek-disable-PHY-mode-EEE.patch
index 4d755d4e22..4d755d4e22 100644
--- a/target/linux/generic/backport-6.12/781-33-v6.15-net-phy-realtek-disable-PHY-mode-EEE.patch
+++ b/target/linux/generic/backport-6.12/781-19-v6.15-net-phy-realtek-disable-PHY-mode-EEE.patch