kernel: move Lantiq PEF7061/7071/7072 phy driver to generic

The driver is used for boards outside the lantiq target as well. Move
it to generic to make it available for more targets.

The phy driver is included in kernel 4.8 as INTEL_XWAY_PHY.

Signed-off-by: Mathias Kresin <dev@kresin.me>

diff --git a/target/linux/generic/config-4.4 b/target/linux/generic/config-4.4
index e3458c1de81289f90da27eb005b62a6f06ae8e5e..1c0af9597fd58d2afe26aa2047bad7528b7f7b18 100644 (file)
--- a/target/linux/generic/config-4.4
+++ b/target/linux/generic/config-4.4
@@ -1883,6 +1883,7 @@ CONFIG_KUSER_HELPERS=y
 # CONFIG_L2TP_V3 is not set
 # CONFIG_LANMEDIA is not set
 # CONFIG_LANTIQ is not set
+# CONFIG_LANTIQ_PHY is not set
 # CONFIG_LAPB is not set
 # CONFIG_LASAT is not set
 # CONFIG_LATENCYTOP is not set

diff --git a/target/linux/lantiq/patches-4.4/0023-NET-PHY-adds-driver-for-lantiq-PHY11G.patch b/target/linux/generic/patches-4.4/074-NET-PHY-adds-driver-for-lantiq-PHY11G.patch
similarity index 99%
rename from target/linux/lantiq/patches-4.4/0023-NET-PHY-adds-driver-for-lantiq-PHY11G.patch
rename to target/linux/generic/patches-4.4/074-NET-PHY-adds-driver-for-lantiq-PHY11G.patch
index 3af676297dc8214c0fdfeeb463eef9852f72570d..e24099ef45decc7af03d020ba0a6900688e20559 100644 (file)
--- a/target/linux/lantiq/patches-4.4/0023-NET-PHY-adds-driver-for-lantiq-PHY11G.patch
+++ b/target/linux/generic/patches-4.4/074-NET-PHY-adds-driver-for-lantiq-PHY11G.patch
@@ -13,9 +13,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -202,6 +202,11 @@ config RTL8306_PHY
-       tristate "Driver for Realtek RTL8306S switches"
-       select SWCONFIG
+@@ -156,6 +156,11 @@ config MICROCHIP_PHY
+       help
+         Supports the LAN88XX PHYs.
  
 +config LANTIQ_PHY
 +      tristate "Driver for Lantiq PHYs"
@@ -27,7 +27,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
        depends on PHYLIB
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -46,6 +46,7 @@ obj-$(CONFIG_DP83848_PHY)    += dp83848.o
+@@ -30,6 +30,7 @@ obj-$(CONFIG_DP83848_PHY)    += dp83848.o
  obj-$(CONFIG_DP83867_PHY)     += dp83867.o
  obj-$(CONFIG_STE10XP)         += ste10Xp.o
  obj-$(CONFIG_MICREL_PHY)      += micrel.o

diff --git a/target/linux/generic/patches-4.4/720-phy_adm6996.patch b/target/linux/generic/patches-4.4/720-phy_adm6996.patch
index 3ee02f1005a0040f9b282c2636475391da768a62..bf939e893cbb084b0a93eeda9d29c4d38ad97c37 100644 (file)
--- a/target/linux/generic/patches-4.4/720-phy_adm6996.patch
+++ b/target/linux/generic/patches-4.4/720-phy_adm6996.patch
@@ -1,8 +1,8 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -170,6 +170,13 @@ config MICROCHIP_PHY
-       help
-         Supports the LAN88XX PHYs.
+@@ -175,6 +175,13 @@ config LANTIQ_PHY
+       ---help---
+         Supports the 11G and 22F PHYs.
  
 +config ADM6996_PHY
 +      tristate "Driver for ADM6996 switches"

diff --git a/target/linux/generic/patches-4.4/722-phy_mvswitch.patch b/target/linux/generic/patches-4.4/722-phy_mvswitch.patch
index 9cfca24b95b5b4ebcef0deadfa52b6b38bfee775..37ec7d9e5d9d28642f412c132808f0fe06856bc4 100644 (file)
--- a/target/linux/generic/patches-4.4/722-phy_mvswitch.patch
+++ b/target/linux/generic/patches-4.4/722-phy_mvswitch.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -177,6 +177,10 @@ config ADM6996_PHY
+@@ -182,6 +182,10 @@ config ADM6996_PHY
          Currently supports the ADM6996FC and ADM6996M switches.
          Support for FC is very limited.
  

diff --git a/target/linux/generic/patches-4.4/723-phy_ip175c.patch b/target/linux/generic/patches-4.4/723-phy_ip175c.patch
index 60b79a2aaef669871e5b80034bdbbd93fe1ac47c..5eb10bb30f3c02848cb83600b1a68785e2a8c8e6 100644 (file)
--- a/target/linux/generic/patches-4.4/723-phy_ip175c.patch
+++ b/target/linux/generic/patches-4.4/723-phy_ip175c.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -181,6 +181,10 @@ config MVSWITCH_PHY
+@@ -186,6 +186,10 @@ config MVSWITCH_PHY
        tristate "Driver for Marvell 88E6060 switches"
        select ETHERNET_PACKET_MANGLE
  

diff --git a/target/linux/generic/patches-4.4/724-phy_ar8216.patch b/target/linux/generic/patches-4.4/724-phy_ar8216.patch
index 626a2f3cbaeba84c111bce8aa15c203e90d8eab1..8cd00343345a9bddd6e5c9b76942dc12d0b82fbe 100644 (file)
--- a/target/linux/generic/patches-4.4/724-phy_ar8216.patch
+++ b/target/linux/generic/patches-4.4/724-phy_ar8216.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -185,6 +185,11 @@ config IP17XX_PHY
+@@ -190,6 +190,11 @@ config IP17XX_PHY
        tristate "Driver for IC+ IP17xx switches"
        select SWCONFIG
  

diff --git a/target/linux/generic/patches-4.4/725-phy_rtl8306.patch b/target/linux/generic/patches-4.4/725-phy_rtl8306.patch
index f38922f6e185d53144ef5fa26ef10321e0c8abca..2bf27607648f4fdc820f6602bd6ba37a1a0747ce 100644 (file)
--- a/target/linux/generic/patches-4.4/725-phy_rtl8306.patch
+++ b/target/linux/generic/patches-4.4/725-phy_rtl8306.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -190,6 +190,10 @@ config AR8216_PHY
+@@ -195,6 +195,10 @@ config AR8216_PHY
        select ETHERNET_PACKET_MANGLE
        select SWCONFIG
  

diff --git a/target/linux/generic/patches-4.4/726-phy_rtl8366.patch b/target/linux/generic/patches-4.4/726-phy_rtl8366.patch
index 5f50cf48b0add48a14716e92ef276f1e0aa8eb22..53e967b82fa454c3f6af35254ca4cd88b328449c 100644 (file)
--- a/target/linux/generic/patches-4.4/726-phy_rtl8366.patch
+++ b/target/linux/generic/patches-4.4/726-phy_rtl8366.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -294,6 +294,30 @@ config MDIO_BCM_IPROC
+@@ -299,6 +299,30 @@ config MDIO_BCM_IPROC
          This module provides a driver for the MDIO busses found in the
          Broadcom iProc SoC's.
  

diff --git a/target/linux/generic/patches-4.4/727-phy-rtl8367.patch b/target/linux/generic/patches-4.4/727-phy-rtl8367.patch
index 887d12dd95c3b93f20589f56e9c13c84ffa52307..9fa8c8fc2a941524eed7fa261c5f88f3546462de 100644 (file)
--- a/target/linux/generic/patches-4.4/727-phy-rtl8367.patch
+++ b/target/linux/generic/patches-4.4/727-phy-rtl8367.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -316,6 +316,10 @@ config RTL8366RB_PHY
+@@ -321,6 +321,10 @@ config RTL8366RB_PHY
        tristate "Driver for the Realtek RTL8366RB switch"
        select SWCONFIG
  

diff --git a/target/linux/generic/patches-4.4/728-phy-rtl8367b.patch b/target/linux/generic/patches-4.4/728-phy-rtl8367b.patch
index d96bead4dcf5b9e9096f1d8f8f4d9065ccb96a27..12d7fcad9027b2b5005d29163590bdb5b2a6a3a8 100644 (file)
--- a/target/linux/generic/patches-4.4/728-phy-rtl8367b.patch
+++ b/target/linux/generic/patches-4.4/728-phy-rtl8367b.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -320,6 +320,10 @@ config RTL8367_PHY
+@@ -325,6 +325,10 @@ config RTL8367_PHY
        tristate "Driver for the Realtek RTL8367R/M switches"
        select SWCONFIG
  

diff --git a/target/linux/generic/patches-4.4/729-phy-tantos.patch b/target/linux/generic/patches-4.4/729-phy-tantos.patch
index a09032b6c84f60fc9182edb3cd49b5bfc8b16016..3f18c83c421f0ad77af2d13517102d8bc2cd7114 100644 (file)
--- a/target/linux/generic/patches-4.4/729-phy-tantos.patch
+++ b/target/linux/generic/patches-4.4/729-phy-tantos.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -331,3 +331,8 @@ endif # PHYLIB
+@@ -336,3 +336,8 @@ endif # PHYLIB
  config MICREL_KS8995MA
        tristate "Micrel KS8995MA 5-ports 10/100 managed Ethernet switch"
        depends on SPI

diff --git a/target/linux/generic/patches-4.4/730-phy_b53.patch b/target/linux/generic/patches-4.4/730-phy_b53.patch
index 1a6de9672650f565f95869a214e627bd7b814cae..4d5ea7a7549905011692d6eae56092086b5abb92 100644 (file)
--- a/target/linux/generic/patches-4.4/730-phy_b53.patch
+++ b/target/linux/generic/patches-4.4/730-phy_b53.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -326,6 +326,8 @@ config RTL8367B_PHY
+@@ -331,6 +331,8 @@ config RTL8367B_PHY
  
  endif # RTL8366_SMI
  

diff --git a/target/linux/generic/patches-4.4/732-phy-ar8216-led-support.patch b/target/linux/generic/patches-4.4/732-phy-ar8216-led-support.patch
index f4fea5ce504a9cb8d2122d491e0f5d8a2871acfd..799ea494a0dddd4e9caafc247506902dbd563e1f 100644 (file)
--- a/target/linux/generic/patches-4.4/732-phy-ar8216-led-support.patch
+++ b/target/linux/generic/patches-4.4/732-phy-ar8216-led-support.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -190,6 +190,10 @@ config AR8216_PHY
+@@ -195,6 +195,10 @@ config AR8216_PHY
        select ETHERNET_PACKET_MANGLE
        select SWCONFIG
  

diff --git a/target/linux/generic/patches-4.4/733-phy_mvsw61xx.patch b/target/linux/generic/patches-4.4/733-phy_mvsw61xx.patch
index 2e131368b9fb46d35b48d18a9e4a6f7c80b04e6b..4daa9e8c877e5fb6cbea1dd5d97c86637ed28bc7 100644 (file)
--- a/target/linux/generic/patches-4.4/733-phy_mvsw61xx.patch
+++ b/target/linux/generic/patches-4.4/733-phy_mvsw61xx.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -181,6 +181,10 @@ config MVSWITCH_PHY
+@@ -186,6 +186,10 @@ config MVSWITCH_PHY
        tristate "Driver for Marvell 88E6060 switches"
        select ETHERNET_PACKET_MANGLE
  

diff --git a/target/linux/lantiq/config-4.4 b/target/linux/lantiq/config-4.4
index 073b7c7cf78b002efd72bcf76144fa0c1d45a41e..f14fd57ea1f2671b6e219de2ed0a40a211da73bb 100644 (file)
--- a/target/linux/lantiq/config-4.4
+++ b/target/linux/lantiq/config-4.4
@@ -110,7 +110,6 @@ CONFIG_IRQ_WORK=y
 CONFIG_LANTIQ=y
 CONFIG_LANTIQ_DT_NONE=y
 CONFIG_LANTIQ_ETOP=y
-# CONFIG_LANTIQ_PHY is not set
 CONFIG_LANTIQ_WDT=y
 # CONFIG_LANTIQ_XRX200 is not set
 CONFIG_LEDS_GPIO=y