enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix kernel 6.18/6.19 patch compilation and cleanup upstreamed patches (#9447)

Browse Source 
* uefi-arm64-6.18: fix stmmac Phytium driver compilation

Remove obsolete 'has_gmac' member assignment from struct plat_stmmacenet_data.
The field was removed in newer kernels as MAC version detection is now
handled automatically from hardware registers.

Fixes compilation error:
  error: 'struct plat_stmmacenet_data' has no member named 'has_gmac'

* meson64-6.19: drop upstreamed odroid regulator boot-on patch

The Odroid HC4 regulator-boot-on fix has been upstreamed in kernel 6.19.

Original patch:
  Fixes: 164147f094ec ("arm64: dts: meson-sm1-odroid-hc4: add regulators")
  Fixes: 45d736ab17b4 ("arm64: dts: meson-sm1-odroid: add 5v regulator gpio")
  Fixes: 1f80a5cf74a6 ("arm64: dts: meson-sm1-odroid: add missing enable gpio")
  Fixes: 88d537bc92ca ("arm64: dts: meson: convert meson-sm1-odroid-c4 to dtsi")

* meson64-6.18: update meson-axg mmc phase configuration

Add amlogic,mmc-phase properties to sd_emmc_b and sd_emmc_c nodes
for proper MMC timing configuration on Amlogic AXG SoCs.

* Disable Pythium onboard nic driver
This commit is contained in:
Igor 2026-03-01 01:19:43 +01:00 committed by GitHub
parent 1b74748622
commit 7972ddbc4c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 28 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
patch/kernel/archive/meson64-6.18/general-meson-mmc-2-arm64-amlogic-dts-meson-update-meson-axg-device-tree.patch
View File

@ -23,22 +23,30 @@ index 111111111111..222222222222 100644
/ {
compatible = "amlogic,meson-axg";
@@ -1959,6 +1960,7 @@ sd_emmc_b: mmc@5000 {
@@ -1958,10 +1958,11 @@ sd_emmc_b: mmc@5000 {
status = "disabled";
clocks = <&clkc CLKID_SD_EMMC_B>,
<&clkc CLKID_SD_EMMC_B_CLK0>,
<&clkc CLKID_FCLK_DIV2>;
clock-names = "core", "clkin0", "clkin1";
+ amlogic,mmc-phase = <CLK_PHASE_270 CLK_PHASE_0 CLK_PHASE_0>;
resets = <&reset RESET_SD_EMMC_B>;
};
@@ -1972,6 +1974,7 @@ sd_emmc_c: mmc@7000 {
assigned-clocks = <&clkc CLKID_SD_EMMC_B_CLK0>;
assigned-clock-rates = <24000000>;
};
@@ -1973,10 +1974,11 @@ sd_emmc_c: mmc@7000 {
status = "disabled";
clocks = <&clkc CLKID_SD_EMMC_C>,
<&clkc CLKID_SD_EMMC_C_CLK0>,
<&clkc CLKID_FCLK_DIV2>;
clock-names = "core", "clkin0", "clkin1";
resets = <&reset RESET_SD_EMMC_C>;
+ amlogic,mmc-phase = <CLK_PHASE_270 CLK_PHASE_0 CLK_PHASE_0>;
};
resets = <&reset RESET_SD_EMMC_C>;
nfc: nand-controller@7800 {
assigned-clocks = <&clkc CLKID_SD_EMMC_C_CLK0>;
assigned-clock-rates = <24000000>;
};
--
Armbian

99
patch/kernel/archive/meson64-6.19/board-odroid-sm1-regulators-boot-on.patch
View File

@ -1,99 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Eric Neulight <Eric.Neulight@linuxdev.slmail.me>
Date: Fri, 16 Jan 2026 23:02:20 -0500
Subject: Eliminate Odroid HC4 power glitches during boot.
Fix issue with Odroid HC4 (and all meson-sm1-odroid) DTS that causes
regulator power to momentarily glitch OFF-ON during boot. Add
regulator-boot-on to all regulator-fixed and regulator-gpio entries
that (1) define a gpio AND (2) define regulator-always-on.
U-boot powers on devices necessary for boot then hands off the DTB to
the kernel. During probe, linux drivers/regulator/fixed.c and
gpio-regulator.c both first set the regulator control gpio (that U-boot
already turned ON) to default OFF before then setting it to the defined
(ON) state. This glitches the power to the affected devices, unless
regulator-boot-on is specified with it. In fact, U-boot has the same
behavior. So, during reboot, a power glitch can actually happen twice:
once when U-boot reads the DTB and probes the gpio and again when the
kernel reads the DTB and probes the gpio.
Problem this fixes: On the Odroid HC4, power to the SATA ports glitches
during boot and causes some HDDs to do emergency head retract, which
should be avoided. On the HC4, power glitches to the SD card, USB,
SATA, and HDMI interfaces during boot. These are all boot devices.
A power glitch can potentially cause a problem for any sensitive devices
during boot.
NOTE: This is not limited to just the HC4, likely an issue with ALL DTS
with regulator-fixed or regulator-gpio entries that (1) define a gpio
AND (2) define regulator-always-on. All such entries should also
include regulator-boot-on in order to avoid potential power glitches.
At worst, adding regulator-boot-on in such cases is harmless because of
regulator-always-on, and, at best, it eliminates detrimental power
glitches during boot. So, this is best-practice.
Fixes: 164147f094ec5d0fc2c2098a888f4b50cf3096a7 ("arm64: dts: meson-sm1-odroid-hc4: add regulators controlled by GPIOH_8")
Fixes: 45d736ab17b44257e15e75e0dba364139fdb0983 ("arm64: dts: meson-sm1-odroid: add 5v regulator gpio")
Fixes: 1f80a5cf74a60997b92d2cde772edec093bec4d9 ("arm64: dts: meson-sm1-odroid: add missing enable gpio and supply for tf_io regulator")
Fixes: 88d537bc92ca035e2a9920b0abc750dd62146520 ("arm64: dts: meson: convert meson-sm1-odroid-c4 to dtsi")
Signed-off-by: Eric Neulight <Eric.Neulight@linuxdev.slmail.me>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20260116-odroid-hc4-dts-v1-1-459b601cd5cf@linuxdev.slmail.me
---
arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 2 ++
arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 3 +++
2 files changed, 5 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
@@ -52,6 +52,7 @@ p12v_0: regulator-p12v-0 {
gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
enable-active-high;
+ regulator-boot-on;
regulator-always-on;
};
@@ -65,6 +66,7 @@ p12v_1: regulator-p12v-1 {
gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
enable-active-high;
+ regulator-boot-on;
regulator-always-on;
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
@@ -37,6 +37,7 @@ tflash_vdd: regulator-tflash-vdd {
gpio = <&gpio_ao GPIOAO_3 GPIO_OPEN_DRAIN>;
enable-active-high;
+ regulator-boot-on;
regulator-always-on;
};
@@ -50,6 +51,7 @@ tf_io: gpio-regulator-tf-io {
enable-gpios = <&gpio_ao GPIOE_2 GPIO_OPEN_DRAIN>;
enable-active-high;
+ regulator-boot-on;
regulator-always-on;
gpios = <&gpio_ao GPIOAO_6 GPIO_OPEN_SOURCE>;
@@ -81,6 +83,7 @@ vcc_5v: regulator-vcc-5v {
regulator-name = "5V";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
+ regulator-boot-on;
regulator-always-on;
vin-supply = <&main_12v>;
gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
--
Armbian

20
patch/kernel/archive/meson64-6.19/general-meson-mmc-2-arm64-amlogic-dts-meson-update-meson-axg-device-tree.patch
View File

@ -23,22 +23,30 @@ index 111111111111..222222222222 100644
/ {
compatible = "amlogic,meson-axg";
@@ -1959,6 +1960,7 @@ sd_emmc_b: mmc@5000 {
@@ -1958,10 +1958,11 @@ sd_emmc_b: mmc@5000 {
status = "disabled";
clocks = <&clkc CLKID_SD_EMMC_B>,
<&clkc CLKID_SD_EMMC_B_CLK0>,
<&clkc CLKID_FCLK_DIV2>;
clock-names = "core", "clkin0", "clkin1";
+ amlogic,mmc-phase = <CLK_PHASE_270 CLK_PHASE_0 CLK_PHASE_0>;
resets = <&reset RESET_SD_EMMC_B>;
};
@@ -1972,6 +1974,7 @@ sd_emmc_c: mmc@7000 {
assigned-clocks = <&clkc CLKID_SD_EMMC_B_CLK0>;
assigned-clock-rates = <24000000>;
};
@@ -1973,10 +1974,11 @@ sd_emmc_c: mmc@7000 {
status = "disabled";
clocks = <&clkc CLKID_SD_EMMC_C>,
<&clkc CLKID_SD_EMMC_C_CLK0>,
<&clkc CLKID_FCLK_DIV2>;
clock-names = "core", "clkin0", "clkin1";
resets = <&reset RESET_SD_EMMC_C>;
+ amlogic,mmc-phase = <CLK_PHASE_270 CLK_PHASE_0 CLK_PHASE_0>;
};
resets = <&reset RESET_SD_EMMC_C>;
nfc: nand-controller@7800 {
assigned-clocks = <&clkc CLKID_SD_EMMC_C_CLK0>;
assigned-clock-rates = <24000000>;
};
--
Armbian

0
patch/kernel/archive/uefi-arm64-6.18/net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch → patch/kernel/archive/uefi-arm64-6.18/net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch.disabled
View File