diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc index 631c55acef..500f537814 100644 --- a/config/sources/families/include/sunxi64_common.inc +++ b/config/sources/families/include/sunxi64_common.inc @@ -10,8 +10,7 @@ case $BRANCH in legacy) KERNELBRANCH='branch:linux-4.19.y' - KERNELPATCHDIR='sunxi-next' - + KERNELPATCHDIR='sunxi-'$BRANCH ;; current) diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc index 6d3b686d91..a4ba7b7c5b 100644 --- a/config/sources/families/include/sunxi_common.inc +++ b/config/sources/families/include/sunxi_common.inc @@ -13,7 +13,7 @@ case $BRANCH in legacy) KERNELBRANCH='branch:linux-4.19.y' - + KERNELPATCHDIR='sunxi-'$BRANCH ;; current) diff --git a/patch/kernel/sunxi-legacy/0003-net-stmmac-dwmac-sun8i-support-RGMII-modes-with-PHY-.patch b/patch/kernel/sunxi-legacy/0003-net-stmmac-dwmac-sun8i-support-RGMII-modes-with-PHY-.patch deleted file mode 100644 index c417b72447..0000000000 --- a/patch/kernel/sunxi-legacy/0003-net-stmmac-dwmac-sun8i-support-RGMII-modes-with-PHY-.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 98800eeb2244387e821f4af8d21ccf2deaf18da0 Mon Sep 17 00:00:00 2001 -From: Icenowy Zheng -Date: Mon, 21 Aug 2017 23:02:32 +0800 -Subject: [PATCH 003/146] net: stmmac: dwmac-sun8i: support RGMII modes with - PHY internal delay - -Some boards uses a PHY with internal delay with an Allwinner SoC. - -Support these PHY modes in the driver. - -As the driver has no configuration registers for these modes, just treat -them as ordinary RGMII. - -Signed-off-by: Icenowy Zheng ---- - drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c -index f9a61f90cfbc..3c18f4a9dd6c 100644 ---- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c -+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c -@@ -933,6 +933,9 @@ static int sun8i_dwmac_set_syscon(struct stmmac_priv *priv) - /* default */ - break; - case PHY_INTERFACE_MODE_RGMII: -+ case PHY_INTERFACE_MODE_RGMII_ID: -+ case PHY_INTERFACE_MODE_RGMII_RXID: -+ case PHY_INTERFACE_MODE_RGMII_TXID: - reg |= SYSCON_EPIT | SYSCON_ETCS_INT_GMII; - break; - case PHY_INTERFACE_MODE_RMII: --- -2.17.1 -