meson64-6.18: rewrite kernel patches against 6.18.33

Author: EvilOlaf

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

@@ -23,15 +23,15 @@ index 111111111111..222222222222 100644
 
  / {
  	compatible = "amlogic,meson-axg";
-@@ -1959,6 +1960,7 @@ sd_emmc_b: mmc@5000 {
+@@ -1965,6 +1966,7 @@ sd_emmc_b: mmc@5000 {
  					<&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>;
 
  				assigned-clocks = <&clkc CLKID_SD_EMMC_B_CLK0>;
-@@ -1974,6 +1976,7 @@ sd_emmc_c: mmc@7000 {
+@@ -1980,6 +1982,7 @@ sd_emmc_c: mmc@7000 {
  					<&clkc CLKID_SD_EMMC_C_CLK0>,
  					<&clkc CLKID_FCLK_DIV2>;
  				clock-names = "core", "clkin0", "clkin1";

patch/kernel/archive/meson64-6.18/general-soc-0004-arm64-dts-meson-add-dts-links-to-secure-monitor-for-.patch

@@ -31,7 +31,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/am
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
-@@ -1711,6 +1711,7 @@ mux {
+@@ -1717,6 +1717,7 @@ mux {
  			sec_AO: ao-secure@140 {
  				compatible = "amlogic,meson-gx-ao-secure", "syscon";
  				reg = <0x0 0x140 0x0 0x140>;

patch/kernel/archive/meson64-6.18/general-spi-nor-add-support-for-XT25F128B.patch

@@ -58,7 +58,7 @@ diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h
 index 111111111111..222222222222 100644
 --- a/drivers/mtd/spi-nor/core.h
 +++ b/drivers/mtd/spi-nor/core.h
-@@ -598,6 +598,7 @@ extern const struct spi_nor_manufacturer spi_nor_spansion;
+@@ -604,6 +604,7 @@ extern const struct spi_nor_manufacturer spi_nor_spansion;
  extern const struct spi_nor_manufacturer spi_nor_sst;
  extern const struct spi_nor_manufacturer spi_nor_winbond;
  extern const struct spi_nor_manufacturer spi_nor_xmc;