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

* 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

Author: igorpecovnik

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

@@ -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
 

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

@@ -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