From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 23 May 2022 14:03:04 +0000 (+0200)
Subject: Merge tag 'asoc-v5.19' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: microblaze-v5.20~57^2~10
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=0163717ed5dec4fc3aaf937baa9f66f21ca11c1d;p=linux-2.6-microblaze.git

Merge tag 'asoc-v5.19' of https://git./linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v5.19

This is quite a big update, partly due to the addition of some larger
drivers (more of which is to follow since at least the AVS driver is
still a work in progress) and partly due to Charles' work sorting out
our handling of endianness.  As has been the case recently it's much
more about drivers than the core.

 - Overhaul of endianness specification for data formats, avoiding
   needless restrictions due to CODECs.
 - Initial stages of Intel AVS driver merge.
 - Introduction of v4 IPC mechanism for SOF.
 - TDM mode support for AK4613.
 - Support for Analog Devices ADAU1361, Cirrus Logic CS35L45, Maxim
   MAX98396, MediaTek MT8186, NXP i.MX8 micfil and SAI interfaces,
   nVidia Tegra186 ASRC, and Texas Instruments TAS2764 and TAS2780
---

0163717ed5dec4fc3aaf937baa9f66f21ca11c1d
diff --cc include/sound/cs35l41.h
index dd70fb8dd860,9341130257ea..8972fa697622
--- a/include/sound/cs35l41.h
+++ b/include/sound/cs35l41.h
@@@ -537,8 -536,8 +537,7 @@@
  
  #define CS35L41_MAX_CACHE_REG		36
  #define CS35L41_OTP_SIZE_WORDS		32
- #define CS35L41_NUM_OTP_ELEM		100
  
 -#define CS35L41_VALID_PDATA		0x80000000
  #define CS35L41_NUM_SUPPLIES            2
  
  #define CS35L41_SCLK_MSTR_MASK		0x10
diff --cc sound/soc/codecs/cs35l41.c
index 5f0eca229dd3,de6f96bd8daf..3e68a07a3c8e
--- a/sound/soc/codecs/cs35l41.c
+++ b/sound/soc/codecs/cs35l41.c
@@@ -1025,12 -1113,14 +1025,14 @@@ static const struct snd_soc_component_d
  	.controls = cs35l41_aud_controls,
  	.num_controls = ARRAY_SIZE(cs35l41_aud_controls),
  	.set_sysclk = cs35l41_component_set_sysclk,
+ 
+ 	.endianness = 1,
  };
  
 -static int cs35l41_handle_pdata(struct device *dev, struct cs35l41_platform_data *pdata)
 +static int cs35l41_handle_pdata(struct device *dev, struct cs35l41_hw_cfg *hw_cfg)
  {
 -	struct cs35l41_irq_cfg *irq_gpio1_config = &pdata->irq_config1;
 -	struct cs35l41_irq_cfg *irq_gpio2_config = &pdata->irq_config2;
 +	struct cs35l41_gpio_cfg *gpio1 = &hw_cfg->gpio1;
 +	struct cs35l41_gpio_cfg *gpio2 = &hw_cfg->gpio2;
  	unsigned int val;
  	int ret;