From 3188743b1aa5d1eb56e86360ce3ba0b0d2857cc1 Mon Sep 17 00:00:00 2001
From: The-going <48602507+The-going@users.noreply.github.com>
Date: Sat, 31 May 2025 23:17:20 +0300
Subject: [PATCH] sunxi-6.15: Fix compilation errors caused by patch migration

Signed-off-by: The-going <48602507+The-going@users.noreply.github.com>
---
 .../patches.armbian/Sound-for-H616-H618-Allwinner-SOCs.patch  | 4 ++--
 .../drv-spi-spi-sun4i.c-spi-bug-low-on-sck.patch              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/patch/kernel/archive/sunxi-6.15/patches.armbian/Sound-for-H616-H618-Allwinner-SOCs.patch b/patch/kernel/archive/sunxi-6.15/patches.armbian/Sound-for-H616-H618-Allwinner-SOCs.patch
index b980204a6..61d3cb777 100644
--- a/patch/kernel/archive/sunxi-6.15/patches.armbian/Sound-for-H616-H618-Allwinner-SOCs.patch
+++ b/patch/kernel/archive/sunxi-6.15/patches.armbian/Sound-for-H616-H618-Allwinner-SOCs.patch
@@ -799,12 +799,12 @@ index 000000000000..6d4a847a928f
 +
 +       /* set master/slave */
 +       switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-+       case    SND_SOC_DAIFMT_CBM_CFM:
++       case    SND_SOC_DAIFMT_CBP_CFP:
 +               /* lrck & bclk dir output */
 +               regmap_update_bits(regmap, SUNXI_AHUB_I2S_CTL(tdm_num),
 +                                  0x1 << I2S_CTL_CLK_OUT, 0x0 << I2S_CTL_CLK_OUT);
 +               break;
-+       case    SND_SOC_DAIFMT_CBS_CFS:
++       case    SND_SOC_DAIFMT_CBC_CFC:
 +               /* lrck & bclk dir input */
 +               regmap_update_bits(regmap, SUNXI_AHUB_I2S_CTL(tdm_num),
 +                                  0x1 << I2S_CTL_CLK_OUT, 0x1 << I2S_CTL_CLK_OUT);
diff --git a/patch/kernel/archive/sunxi-6.15/patches.armbian/drv-spi-spi-sun4i.c-spi-bug-low-on-sck.patch b/patch/kernel/archive/sunxi-6.15/patches.armbian/drv-spi-spi-sun4i.c-spi-bug-low-on-sck.patch
index bbcb28892..cd394670f 100644
--- a/patch/kernel/archive/sunxi-6.15/patches.armbian/drv-spi-spi-sun4i.c-spi-bug-low-on-sck.patch
+++ b/patch/kernel/archive/sunxi-6.15/patches.armbian/drv-spi-spi-sun4i.c-spi-bug-low-on-sck.patch
@@ -26,7 +26,7 @@ index aa92fd5a35a9..9f3273256354 100644
 -	sun4i_spi_write(sspi, SUN4I_CTL_REG,
 -			SUN4I_CTL_MASTER | SUN4I_CTL_TP);
 +	reg = sun4i_spi_read(sspi, SUN4I_CTL_REG);
-+	sun4i_spi_write(reg | SUN4I_CTL_MASTER | SUN4I_CTL_TP);
++	sun4i_spi_write(sspi, SUN4I_CTL_REG, reg | SUN4I_CTL_MASTER | SUN4I_CTL_TP);
  
  	return 0;