From 15977758bab18c47ee11bb214b00a1d5dd9d4a03 Mon Sep 17 00:00:00 2001 From: Martin Kennedy Date: Tue, 16 Feb 2021 01:44:01 +0000 Subject: [PATCH] Rebase patch on newer kernel --- .../octeon/patches-5.4/0001_add_vsc_phy.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/target/linux/octeon/patches-5.4/0001_add_vsc_phy.patch b/target/linux/octeon/patches-5.4/0001_add_vsc_phy.patch index cef0091b33..891222ed04 100644 --- a/target/linux/octeon/patches-5.4/0001_add_vsc_phy.patch +++ b/target/linux/octeon/patches-5.4/0001_add_vsc_phy.patch @@ -24,6 +24,8 @@ Signed-off-by: David Daney Signed-off-by: Aaron Williams Signed-off-by: Leonid Rosenboim Signed-off-by: Abhishek Paliwal +[Rebased on kernel 5.4 by Martin Kennedy ] +Signed-off-by: Martin Kennedy --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -54,6 +54,13 @@ config VITESSE_PHY @@ -42,14 +44,12 @@ Signed-off-by: Abhishek Paliwal ---help--- --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile -@@ -10,6 +10,7 @@ obj-$(CONFIG_LXT_PHY) += lxt.o - obj-$(CONFIG_QSEMI_PHY) += qsemi.o - obj-$(CONFIG_SMSC_PHY) += smsc.o - obj-$(CONFIG_VITESSE_PHY) += vitesse.o +@@ -108,4 +108,5 @@ + obj-$(CONFIG_STE10XP) += ste10Xp.o + obj-$(CONFIG_TERANETICS_PHY) += teranetics.o + obj-$(CONFIG_VITESSE_PHY) += vitesse.o +obj-$(CONFIG_VSC848X_PHY) += vsc848x.o - obj-$(CONFIG_BROADCOM_PHY) += broadcom.o - obj-$(CONFIG_BCM63XX_PHY) += bcm63xx.o - obj-$(CONFIG_BCM87XX_PHY) += bcm87xx.o + obj-$(CONFIG_XILINX_GMII2RGMII) += xilinx_gmii2rgmii.o --- /dev/null +++ b/drivers/net/phy/vsc848x.c @@ -0,0 +1,774 @@