[openwrt/openwrt] ipq40xx: 5.10: move AR40xx to MDIO drivers

[LEDE Commits]

adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/f4fb63d2ab4f152fa2950ce7a77cabd16f757d06

commit f4fb63d2ab4f152fa2950ce7a77cabd16f757d06
Author: Robert Marko <robert.marko at sartura.hr>
AuthorDate: Sun Sep 12 23:50:20 2021 +0200

    ipq40xx: 5.10: move AR40xx to MDIO drivers
    
    MDIO drivers were moved into their own sub directory of networking drivers.
    This has caused the AR40xx driver to probe before MDIO drivers and that wont
    work as it depends on the MDIO bus to be up so it can be fetched.
    
    Lets solve it by moving the AR40xx into MDIO folder so they get probed like
    before.
    
    Signed-off-by: Robert Marko <robert.marko at sartura.hr>
---
 .../phy => files-5.10/drivers/net/mdio}/ar40xx.c   |  0
 .../phy => files-5.10/drivers/net/mdio}/ar40xx.h   |  0
 .../{files => files-5.4}/drivers/net/phy/ar40xx.c  |  0
 .../{files => files-5.4}/drivers/net/phy/ar40xx.h  |  0
 .../705-net-add-qualcomm-ar40xx-phy.patch          | 45 +++++++++++-----------
 .../707-net-phy-Add-Qualcom-QCA807x-driver.patch   |  2 +-
 6 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c b/target/linux/ipq40xx/files-5.10/drivers/net/mdio/ar40xx.c
similarity index 100%
copy from target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c
copy to target/linux/ipq40xx/files-5.10/drivers/net/mdio/ar40xx.c
diff --git a/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.h b/target/linux/ipq40xx/files-5.10/drivers/net/mdio/ar40xx.h
similarity index 100%
copy from target/linux/ipq40xx/files/drivers/net/phy/ar40xx.h
copy to target/linux/ipq40xx/files-5.10/drivers/net/mdio/ar40xx.h
diff --git a/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c b/target/linux/ipq40xx/files-5.4/drivers/net/phy/ar40xx.c
similarity index 100%
rename from target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c
rename to target/linux/ipq40xx/files-5.4/drivers/net/phy/ar40xx.c
diff --git a/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.h b/target/linux/ipq40xx/files-5.4/drivers/net/phy/ar40xx.h
similarity index 100%
rename from target/linux/ipq40xx/files/drivers/net/phy/ar40xx.h
rename to target/linux/ipq40xx/files-5.4/drivers/net/phy/ar40xx.h
diff --git a/target/linux/ipq40xx/patches-5.10/705-net-add-qualcomm-ar40xx-phy.patch b/target/linux/ipq40xx/patches-5.10/705-net-add-qualcomm-ar40xx-phy.patch
index 6b0272bd72..cd0b10c6c8 100644
--- a/target/linux/ipq40xx/patches-5.10/705-net-add-qualcomm-ar40xx-phy.patch
+++ b/target/linux/ipq40xx/patches-5.10/705-net-add-qualcomm-ar40xx-phy.patch
@@ -1,26 +1,27 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -388,6 +388,13 @@ config XILINX_GMII2RGMII
- 	  the Reduced Gigabit Media Independent Interface(RGMII) between
- 	  Ethernet physical media devices and the Gigabit Ethernet controller.
+--- a/drivers/net/mdio/Kconfig
++++ b/drivers/net/mdio/Kconfig
+@@ -27,6 +27,13 @@ config OF_MDIO
+ 	help
+ 	  OpenFirmware MDIO bus (Ethernet PHY) accessors
  
 +config AR40XX_PHY
-+	tristate "Driver for Qualcomm Atheros IPQ40XX switches"
-+	depends on HAS_IOMEM && OF && OF_MDIO
-+	select SWCONFIG
-+	help
-+	   This is the driver for Qualcomm Atheros IPQ40XX ESS switches.
++   tristate "Driver for Qualcomm Atheros IPQ40XX switches"
++   depends on HAS_IOMEM && OF && OF_MDIO
++   select SWCONFIG
++   help
++      This is the driver for Qualcomm Atheros IPQ40XX ESS switches.
 +
- endif # PHYLIB
+ if MDIO_BUS
  
- config MICREL_KS8995MA
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -50,6 +50,7 @@ ifdef CONFIG_HWMON
- aquantia-objs			+= aquantia_hwmon.o
- endif
- obj-$(CONFIG_AQUANTIA_PHY)	+= aquantia.o
-+obj-$(CONFIG_AR40XX_PHY)	+= ar40xx.o
- obj-$(CONFIG_AT803X_PHY)	+= at803x.o
- obj-$(CONFIG_AX88796B_PHY)	+= ax88796b.o
- obj-$(CONFIG_BCM54140_PHY)	+= bcm54140.o
+ config MDIO_DEVRES
+--- a/drivers/net/mdio/Makefile
++++ b/drivers/net/mdio/Makefile
+@@ -21,6 +21,8 @@ obj-$(CONFIG_MDIO_SUN4I)		+= mdio-sun4i.
+ obj-$(CONFIG_MDIO_THUNDER)		+= mdio-thunder.o
+ obj-$(CONFIG_MDIO_XGENE)		+= mdio-xgene.o
+ 
++obj-$(CONFIG_AR40XX_PHY)		+= ar40xx.o
++
+ obj-$(CONFIG_MDIO_BUS_MUX)		+= mdio-mux.o
+ obj-$(CONFIG_MDIO_BUS_MUX_BCM_IPROC)	+= mdio-mux-bcm-iproc.o
+ obj-$(CONFIG_MDIO_BUS_MUX_GPIO)		+= mdio-mux-gpio.o
diff --git a/target/linux/ipq40xx/patches-5.10/707-net-phy-Add-Qualcom-QCA807x-driver.patch b/target/linux/ipq40xx/patches-5.10/707-net-phy-Add-Qualcom-QCA807x-driver.patch
index 55b74d1e56..b58797c321 100644
--- a/target/linux/ipq40xx/patches-5.10/707-net-phy-Add-Qualcom-QCA807x-driver.patch
+++ b/target/linux/ipq40xx/patches-5.10/707-net-phy-Add-Qualcom-QCA807x-driver.patch
@@ -40,7 +40,7 @@ Signed-off-by: Robert Marko <robert.marko at sartura.hr>
  	help
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -86,6 +86,7 @@ obj-$(CONFIG_MICROSEMI_PHY)	+= mscc/
+@@ -85,6 +85,7 @@ obj-$(CONFIG_MICROSEMI_PHY)	+= mscc/
  obj-$(CONFIG_NATIONAL_PHY)	+= national.o
  obj-$(CONFIG_NXP_TJA11XX_PHY)	+= nxp-tja11xx.o
  obj-$(CONFIG_QSEMI_PHY)		+= qsemi.o