generic: import rtl8261n patches from mediatek

RTL8261N is used on some Airoha and Realtek devices. Move the driver
from Mediatek to generic so it can be used everywhere.

Signed-off-by: Andrew LaMarche <andrewjlamarche@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/18163
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/generic/config-6.6 b/target/linux/generic/config-6.6
index 5051a8aba249501c81925fc1b13ab4dbb5449a00..579209607332a5893e3879f96784d09ac6df0826 100644 (file)
--- a/target/linux/generic/config-6.6
+++ b/target/linux/generic/config-6.6
@@ -5147,6 +5147,7 @@ CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 # CONFIG_RTL8187 is not set
 # CONFIG_RTL8192E is not set
 # CONFIG_RTL8192U is not set
+# CONFIG_RTL8261N_PHY is not set
 # CONFIG_RTL8306_PHY is not set
 # CONFIG_RTL8366RB_PHY is not set
 # CONFIG_RTL8366S_PHY is not set

diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/Kconfig b/target/linux/generic/files/drivers/net/phy/rtl8261n/Kconfig
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/Kconfig
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/Kconfig

diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/Makefile b/target/linux/generic/files/drivers/net/phy/rtl8261n/Makefile
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/Makefile
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/Makefile

diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/construct/conf_rtl8261n_c.c b/target/linux/generic/files/drivers/net/phy/rtl8261n/construct/conf_rtl8261n_c.c
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/construct/conf_rtl8261n_c.c
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/construct/conf_rtl8261n_c.c

diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/construct/conf_rtl8264b.c b/target/linux/generic/files/drivers/net/phy/rtl8261n/construct/conf_rtl8264b.c
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/construct/conf_rtl8264b.c
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/construct/conf_rtl8264b.c

diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/error.h b/target/linux/generic/files/drivers/net/phy/rtl8261n/error.h
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/error.h
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/error.h

diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/phy_patch.c b/target/linux/generic/files/drivers/net/phy/rtl8261n/phy_patch.c
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/phy_patch.c
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/phy_patch.c

diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/phy_patch.h b/target/linux/generic/files/drivers/net/phy/rtl8261n/phy_patch.h
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/phy_patch.h
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/phy_patch.h

diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.c b/target/linux/generic/files/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.c
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.c
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.c

diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.h b/target/linux/generic/files/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.h
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.h
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/phy_rtl826xb_patch.h

diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_osal.c b/target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_osal.c
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_osal.c
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_osal.c

diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_osal.h b/target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_osal.h
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_osal.h
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_osal.h

diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_phy.c b/target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phy.c
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_phy.c
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phy.c

diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_phylib.c b/target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib.c
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_phylib.c
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib.c

diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_phylib.h b/target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib.h
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_phylib.h
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib.h

diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_phylib_def.h b/target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib_def.h
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_phylib_def.h
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib_def.h

diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.c b/target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.c
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.c
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.c

diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.h b/target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.h
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.h
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/rtk_phylib_rtl826xb.h

diff --git a/target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/type.h b/target/linux/generic/files/drivers/net/phy/rtl8261n/type.h
similarity index 100%
rename from target/linux/mediatek/files-6.6/drivers/net/phy/rtl8261n/type.h
rename to target/linux/generic/files/drivers/net/phy/rtl8261n/type.h

diff --git a/target/linux/mediatek/patches-6.6/735-net-phy-realtek-rtl8261n.patch b/target/linux/generic/hack-6.6/735-net-phy-realtek-rtl8261n.patch
similarity index 87%
rename from target/linux/mediatek/patches-6.6/735-net-phy-realtek-rtl8261n.patch
rename to target/linux/generic/hack-6.6/735-net-phy-realtek-rtl8261n.patch
index 676bd7c093d24c1f99eee9cacf373809b40fd643..946869c3037377a302c653c0bbeb1769f0c3aebe 100644 (file)
--- a/target/linux/mediatek/patches-6.6/735-net-phy-realtek-rtl8261n.patch
+++ b/target/linux/generic/hack-6.6/735-net-phy-realtek-rtl8261n.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -396,6 +396,8 @@ config QSEMI_PHY
+@@ -406,6 +406,8 @@ config QSEMI_PHY
  
  source "drivers/net/phy/realtek/Kconfig"
  
@@ -18,4 +18,4 @@
 +obj-y                         += rtl8261n/
  obj-$(CONFIG_RENESAS_PHY)     += uPD60620.o
  obj-$(CONFIG_ROCKCHIP_PHY)    += rockchip.o
- obj-$(CONFIG_RTL8367S_GSW)    += rtk/
+ obj-$(CONFIG_SMSC_PHY)                += smsc.o

diff --git a/target/linux/mediatek/mt7622/config-6.6 b/target/linux/mediatek/mt7622/config-6.6
index 9b9ae6342733ab8081aaa85d83cac6c92dd9e8c9..71a6479d85ff3f106a526c8a9f31032a928fd33a 100644 (file)
--- a/target/linux/mediatek/mt7622/config-6.6
+++ b/target/linux/mediatek/mt7622/config-6.6
@@ -423,7 +423,6 @@ CONFIG_RPS=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_MT7622=y
 CONFIG_RTC_I2C_AND_SPI=y
-# CONFIG_RTL8261N_PHY is not set
 CONFIG_RTL8367S_GSW=y
 CONFIG_RWSEM_SPIN_ON_OWNER=y
 CONFIG_SCHED_MC=y

diff --git a/target/linux/mediatek/mt7623/config-6.6 b/target/linux/mediatek/mt7623/config-6.6
index 94372767a6d2339596a0b0a14c40cdd26ddfc878..4dd1ee3631fdc354576a37c65c7678437307c160 100644 (file)
--- a/target/linux/mediatek/mt7623/config-6.6
+++ b/target/linux/mediatek/mt7623/config-6.6
@@ -528,7 +528,6 @@ CONFIG_RTC_CLASS=y
 # CONFIG_RTC_DRV_MT7622 is not set
 CONFIG_RTC_I2C_AND_SPI=y
 CONFIG_RTC_MC146818_LIB=y
-# CONFIG_RTL8261N_PHY is not set
 # CONFIG_RTL8367S_GSW is not set
 CONFIG_RWSEM_SPIN_ON_OWNER=y
 # CONFIG_SERIAL_8250_DMA is not set

diff --git a/target/linux/mediatek/mt7629/config-6.6 b/target/linux/mediatek/mt7629/config-6.6
index 008e57a20c64ca03fe4a506417d2ff43f22918c8..56ea36f27eb70c07a87d6d6dff4dba7ba3dddb62 100644 (file)
--- a/target/linux/mediatek/mt7629/config-6.6
+++ b/target/linux/mediatek/mt7629/config-6.6
@@ -299,7 +299,6 @@ CONFIG_REGMAP_MMIO=y
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RFS_ACCEL=y
 CONFIG_RPS=y
-# CONFIG_RTL8261N_PHY is not set
 # CONFIG_RTL8367S_GSW is not set
 CONFIG_RWSEM_SPIN_ON_OWNER=y
 CONFIG_SCSI=y

diff --git a/target/linux/mediatek/patches-6.6/500-gsw-rtl8367s-mt7622-support.patch b/target/linux/mediatek/patches-6.6/500-gsw-rtl8367s-mt7622-support.patch
index bb7e7be6d2430795a2c88613273d03a3cb8261b6..639403807ffdfcb6dc06f7921c49e3ca6e72aa67 100644 (file)
--- a/target/linux/mediatek/patches-6.6/500-gsw-rtl8367s-mt7622-support.patch
+++ b/target/linux/mediatek/patches-6.6/500-gsw-rtl8367s-mt7622-support.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -416,6 +416,12 @@ config ROCKCHIP_PHY
+@@ -418,6 +418,12 @@ config ROCKCHIP_PHY
        help
          Currently supports the integrated Ethernet PHY.
  
@@ -15,8 +15,8 @@
        select CRC16
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -102,6 +102,7 @@ obj-$(CONFIG_QSEMI_PHY)            += qsemi.o
- obj-$(CONFIG_REALTEK_PHY)     += realtek/
+@@ -103,6 +103,7 @@ obj-$(CONFIG_REALTEK_PHY)  += realtek/
+ obj-y                         += rtl8261n/
  obj-$(CONFIG_RENESAS_PHY)     += uPD60620.o
  obj-$(CONFIG_ROCKCHIP_PHY)    += rockchip.o
 +obj-$(CONFIG_RTL8367S_GSW)    += rtk/

diff --git a/target/linux/realtek/patches-6.6/720-add-rtl-phy.patch b/target/linux/realtek/patches-6.6/720-add-rtl-phy.patch
index 4d6866db24f8c012bed142c837f380c49a411f26..c7078cea4e28151550124c602ba77a88b671eb5a 100644 (file)
--- a/target/linux/realtek/patches-6.6/720-add-rtl-phy.patch
+++ b/target/linux/realtek/patches-6.6/720-add-rtl-phy.patch
@@ -14,9 +14,9 @@ Submitted-by: Birger Koblitz <mail@birger-koblitz.de>
 
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -407,6 +407,12 @@ config QSEMI_PHY
+@@ -409,6 +409,12 @@ source "drivers/net/phy/realtek/Kconfig"
  
- source "drivers/net/phy/realtek/Kconfig"
+ source "drivers/net/phy/rtl8261n/Kconfig"
  
 +config REALTEK_SOC_PHY
 +      tristate "Realtek SoC PHYs"
@@ -29,11 +29,11 @@ Submitted-by: Birger Koblitz <mail@birger-koblitz.de>
        help
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -100,6 +100,7 @@ obj-$(CONFIG_NXP_TJA11XX_PHY)      += nxp-tja
- obj-y                         += qcom/
+@@ -101,6 +101,7 @@ obj-y                              += qcom/
  obj-$(CONFIG_QSEMI_PHY)               += qsemi.o
  obj-$(CONFIG_REALTEK_PHY)     += realtek/
-+obj-$(CONFIG_REALTEK_SOC_PHY)   += rtl83xx-phy.o
+ obj-y                         += rtl8261n/
++obj-$(CONFIG_REALTEK_SOC_PHY) += rtl83xx-phy.o
  obj-$(CONFIG_RENESAS_PHY)     += uPD60620.o
  obj-$(CONFIG_ROCKCHIP_PHY)    += rockchip.o
  obj-$(CONFIG_SMSC_PHY)                += smsc.o

diff --git a/target/linux/siflower/patches-6.6/019-net-phy-add-support-for-Siflower-SF23P1211-SF23P1240.patch b/target/linux/siflower/patches-6.6/019-net-phy-add-support-for-Siflower-SF23P1211-SF23P1240.patch
index 70c60ad72671ea237d13e043b2e13eb20520fd11..4113d82326365849e893559fc3413e1ce9ce46df 100644 (file)
--- a/target/linux/siflower/patches-6.6/019-net-phy-add-support-for-Siflower-SF23P1211-SF23P1240.patch
+++ b/target/linux/siflower/patches-6.6/019-net-phy-add-support-for-Siflower-SF23P1211-SF23P1240.patch
@@ -11,7 +11,7 @@ Signed-off-by: haoming.chen <haoming.chen@siflower.com.cn>
 
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -482,3 +482,8 @@ endif # PHYLIB
+@@ -484,3 +484,8 @@ endif # PHYLIB
  config MICREL_KS8995MA
        tristate "Micrel KS8995MA 5-ports 10/100 managed Ethernet switch"
        depends on SPI
@@ -22,7 +22,7 @@ Signed-off-by: haoming.chen <haoming.chen@siflower.com.cn>
 +        Currently supports the SF1211F, SF1240 gigabit PHY.
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -107,3 +107,4 @@ obj-$(CONFIG_STE10XP)              += ste10Xp.o
+@@ -108,3 +108,4 @@ obj-$(CONFIG_STE10XP)              += ste10Xp.o
  obj-$(CONFIG_TERANETICS_PHY)  += teranetics.o
  obj-$(CONFIG_VITESSE_PHY)     += vitesse.o
  obj-$(CONFIG_XILINX_GMII2RGMII) += xilinx_gmii2rgmii.o