JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

sunxi-6.15: Fix compilation errors caused by patch migration

Browse Source 
Signed-off-by: The-going <48602507+The-going@users.noreply.github.com>
This commit is contained in:
The-going
2025-05-31 23:17:20 +03:00
committed by Igor
parent 65af1b843b
commit 3188743b1a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patch/kernel/archive/sunxi-6.15/patches.armbian/Sound-for-H616-H618-Allwinner-SOCs.patch
View File

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

2
patch/kernel/archive/sunxi-6.15/patches.armbian/drv-spi-spi-sun4i.c-spi-bug-low-on-sck.patch
View File

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