From: Mark Brown <broonie@kernel.org>
Date: Mon, 29 Apr 2024 15:15:57 +0000 (+0900)
Subject: ASoC: Merge up fixes
X-Git-Tag: io_uring-6.10-20240523~78^2~3^2~24
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=9b4f41684b239eedac96913270db4a5669956671;p=linux-block.git

ASoC: Merge up fixes

Some new SOF changes depend on the fixes there.
---

9b4f41684b239eedac96913270db4a5669956671
diff --cc sound/soc/intel/avs/icl.c
index e0880acf8050,d2554c857732..3a96c4304ca6
--- a/sound/soc/intel/avs/icl.c
+++ b/sound/soc/intel/avs/icl.c
@@@ -66,11 -64,10 +66,11 @@@ static_assert(sizeof(struct avs_icl_mem
  struct avs_icl_memwnd2 {
  	union {
  		struct avs_icl_memwnd2_desc slot_desc[AVS_ICL_MEMWND2_SLOTS_COUNT];
- 		u8 rsvd[PAGE_SIZE];
+ 		u8 rsvd[SZ_4K];
  	};
 -	u8 slot_array[AVS_ICL_MEMWND2_SLOTS_COUNT][PAGE_SIZE];
 +	u8 slot_array[AVS_ICL_MEMWND2_SLOTS_COUNT][SZ_4K];
  } __packed;
 +static_assert(sizeof(struct avs_icl_memwnd2) == 65536);
  
  #define AVS_ICL_SLOT_UNUSED \
  	((union avs_icl_memwnd2_slot_type) { 0x00000000U })