qiurui
/
armbian-build
mirror of https://github.com/armbian/build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

uefi-arm64: Rewrite kernel patches against 6.8 

- Using ./compile.sh rewrite-kernel-patches
This commit is contained in:
ColorfulRhino 2024-03-16 17:31:15 +01:00
parent 55d9513c24
commit 8d6842c726
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
patch/kernel/archive/uefi-arm64-6.8/driver-phytium-stmmac-acpi.patch
View File

@ -47,7 +47,7 @@ index 85dcda51df05..7d27700e46e7 100644
tristate "Qualcomm ETHQOS support"
default ARCH_QCOM
diff --git a/drivers/net/ethernet/stmicro/stmmac/Makefile b/drivers/net/ethernet/stmicro/stmmac/Makefile
index 80e598bd4255..e9ab9e2741de 100644
index 26cad4344701..af9ad8ec9626 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Makefile
+++ b/drivers/net/ethernet/stmicro/stmmac/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_DWMAC_IPQ806X) += dwmac-ipq806x.o
@ -337,7 +337,7 @@ index 000000000000..e6ad44b80a10
+MODULE_DESCRIPTION("Glue driver for Phytium DWMAC");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 37e64283f910..aa82d76a6685 100644
index 7c6aef033a45..b6363b855449 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -14,6 +14,7 @@
@ -349,7 +349,7 @@ index 37e64283f910..aa82d76a6685 100644
#include <linux/kernel.h>
#include <linux/interrupt.h>
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 1ffde555da47..28221c3dd587 100644
index 70eadc83ca68..e74ac20b7534 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -9,6 +9,9 @@
@ -362,7 +362,7 @@ index 1ffde555da47..28221c3dd587 100644
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
#include <linux/module.h>
@@ -690,6 +693,248 @@ devm_stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac)
@@ -707,6 +710,248 @@ devm_stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac)
#endif /* CONFIG_OF */
EXPORT_SYMBOL_GPL(devm_stmmac_probe_config_dt);
@ -611,7 +611,7 @@ index 1ffde555da47..28221c3dd587 100644
int stmmac_get_platform_resources(struct platform_device *pdev,
struct stmmac_resources *stmmac_res)
{
@@ -697,8 +942,14 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
@@ -714,8 +959,14 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
/* Get IRQ information early to have an ability to ask for deferred
* probe if needed before we went too far with resource allocation.
@ -627,7 +627,7 @@ index 1ffde555da47..28221c3dd587 100644
if (stmmac_res->irq < 0)
return stmmac_res->irq;
@@ -716,6 +967,7 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
@@ -733,6 +984,7 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
return -EPROBE_DEFER;
dev_info(&pdev->dev, "IRQ eth_wake_irq not found\n");
stmmac_res->wol_irq = stmmac_res->irq;
@ -649,7 +649,7 @@ index bb6fc7e59aed..7c99e1d40e5d 100644
int stmmac_get_platform_resources(struct platform_device *pdev,
struct stmmac_resources *stmmac_res);
diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index 37fb033e1c29..bf6ba5e81a95 100644
index a62442a55774..7f6a7410d0ca 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -111,6 +111,11 @@
@ -664,7 +664,7 @@ index 37fb033e1c29..bf6ba5e81a95 100644
#define AT803X_DEBUG_REG_HIB_CTRL 0x0b
#define AT803X_DEBUG_HIB_CTRL_SEL_RST_80U BIT(10)
#define AT803X_DEBUG_HIB_CTRL_EN_ANY_CHANGE BIT(13)
@@ -397,6 +402,20 @@ static int at803x_enable_rx_delay(struct phy_device *phydev)
@@ -431,6 +436,20 @@ static int at803x_enable_rx_delay(struct phy_device *phydev)
AT803X_DEBUG_RX_CLK_DLY_EN);
}
@ -685,7 +685,7 @@ index 37fb033e1c29..bf6ba5e81a95 100644
static int at803x_enable_tx_delay(struct phy_device *phydev)
{
return at803x_debug_reg_mask(phydev, AT803X_DEBUG_SYSTEM_CTRL_MODE, 0,
@@ -1037,6 +1056,10 @@ static int at803x_config_init(struct phy_device *phydev)
@@ -833,6 +852,10 @@ static int at803x_config_init(struct phy_device *phydev)
ret = at803x_disable_rx_delay(phydev);
if (ret < 0)
return ret;

6
patch/kernel/archive/uefi-arm64-6.8/fix-stmmac-acpi-glue-for-Feiteng-on-6.6.y.patch
View File

@ -34,10 +34,10 @@ index e6ad44b80a10..733f5ea20d0c 100644
/* Set the maxmtu to a default of JUMBO_LEN in case the
* parameter is not present.
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 28221c3dd587..c91049ecfe97 100644
index e74ac20b7534..9c3bb2ba1fa5 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -838,7 +838,7 @@ stmmac_probe_config_acpi(struct platform_device *pdev, u8 *mac)
@@ -855,7 +855,7 @@ stmmac_probe_config_acpi(struct platform_device *pdev, u8 *mac)
np = dev_fwnode(&(pdev->dev));
@ -46,7 +46,7 @@ index 28221c3dd587..c91049ecfe97 100644
/* Get max speed of operation from device tree */
if (fwnode_property_read_u32(np, "max-speed", &plat->max_speed))
@@ -868,8 +868,9 @@ stmmac_probe_config_acpi(struct platform_device *pdev, u8 *mac)
@@ -885,8 +885,9 @@ stmmac_probe_config_acpi(struct platform_device *pdev, u8 *mac)
plat->force_sf_dma_mode =
fwnode_property_read_bool(np, "snps,force_sf_dma_mode");