Merge tag 'sound-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

Pull sound updates from Takashi Iwai:
 "The majority of changes are ASoC drivers (SOF, Intel, AMD, Mediatek,
  Qualcomm, TI, Apple Silicon, etc), while we see a few small fixes in
  ALSA / ASoC core side, too.

  Here are highlights:

  Core:
   - A new string helper parse_int_array_user() and cleanups with it
   - Continued cleanup of memory allocation helpers
   - PCM core optimization and hardening
   - Continued ASoC core code cleanups

  ASoC:
   - Improvements to the SOF IPC4 code, especially around trace
   - Support for AMD Rembrant DSPs, AMD Pink Sardine ACP 6.2, Apple
     Silicon systems, Everest ES8326, Intel Sky Lake and Kaby Lake,
     Mediatek MT8186 support, NXP i.MX8ULP DSPs, Qualcomm SC8280XP,
     SM8250 and SM8450 and Texas Instruments SRC4392

  HD- and USB-audio:
   - Cleanups for unification of hda-ext bus
   - HD-audio HDMI codec driver cleanups
   - Continued endpoint management fixes for USB-audio
   - New quirks as usual"

* tag 'sound-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (422 commits)
  ALSA: hda: Fix position reporting on Poulsbo
  ALSA: hda/hdmi: Don't skip notification handling during PM operation
  ASoC: rockchip: i2s: use regmap_read_poll_timeout_atomic to poll I2S_CLR
  ASoC: dt-bindings: Document audio OF graph dai-tdm-slot-num dai-tdm-slot-width props
  ASoC: qcom: fix unmet direct dependencies for SND_SOC_QDSP6
  ALSA: usb-audio: Fix potential memory leaks
  ALSA: usb-audio: Fix NULL dererence at error path
  ASoC: mediatek: mt8192-mt6359: Set the driver name for the card
  ALSA: hda/realtek: More robust component matching for CS35L41
  ASoC: Intel: sof_rt5682: remove SOF_RT1015_SPEAKER_AMP_100FS flag
  ASoC: nau8825: Add TDM support
  ASoC: core: clarify the driver name initialization
  ASoC: mt6660: Fix PM disable depth imbalance in mt6660_i2c_probe
  ASoC: wm5102: Fix PM disable depth imbalance in wm5102_probe
  ASoC: wm5110: Fix PM disable depth imbalance in wm5110_probe
  ASoC: wm8997: Fix PM disable depth imbalance in wm8997_probe
  ASoC: wcd-mbhc-v2: Revert "ASoC: wcd-mbhc-v2: use pm_runtime_resume_and_get()"
  ASoC: mediatek: mt8186: Fix spelling mistake "slect" -> "select"
  ALSA: hda/realtek: Add quirk for HP Zbook Firefly 14 G9 model
  ALSA: asihpi - Remove unused struct hpi_subsys_response
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc sound/soc/codecs/ak4458.c
index f2d519e,6263108..1db7355
--- 1/sound/soc/codecs/ak4458.c
--- 2/sound/soc/codecs/ak4458.c
+++ b/sound/soc/codecs/ak4458.c
@@@ -824,9 -786,14 +786,12 @@@ static int ak4458_i2c_probe(struct i2c_
        return 0;
  }
  
 -static int ak4458_i2c_remove(struct i2c_client *i2c)
 +static void ak4458_i2c_remove(struct i2c_client *i2c)
  {
+       struct ak4458_priv *ak4458 = i2c_get_clientdata(i2c);
+ 
+       ak4458_reset(ak4458, true);
        pm_runtime_disable(&i2c->dev);
 -
 -      return 0;
  }
  
  static const struct of_device_id ak4458_of_match[] = {

diff --cc sound/soc/codecs/cs42l42-i2c.c
index 0000000,1900ec7..67b2532
mode 000000,100644..100644
--- /dev/null
--- 2/sound/soc/codecs/cs42l42-i2c.c
+++ b/sound/soc/codecs/cs42l42-i2c.c
@@@ -1,0 -1,106 +1,104 @@@
 -static int cs42l42_i2c_remove(struct i2c_client *i2c_client)
+ // SPDX-License-Identifier: GPL-2.0-only
+ /*
+  * cs42l42-i2c.c -- CS42L42 ALSA SoC audio driver for I2C
+  *
+  * Copyright 2016, 2022 Cirrus Logic, Inc.
+  */
+ 
+ #include <linux/i2c.h>
+ #include <linux/module.h>
+ #include <linux/regmap.h>
+ #include <linux/slab.h>
+ #include <linux/types.h>
+ 
+ #include "cs42l42.h"
+ 
+ static int cs42l42_i2c_probe(struct i2c_client *i2c_client)
+ {
+       struct device *dev = &i2c_client->dev;
+       struct cs42l42_private *cs42l42;
+       struct regmap *regmap;
+       int ret;
+ 
+       cs42l42 = devm_kzalloc(dev, sizeof(*cs42l42), GFP_KERNEL);
+       if (!cs42l42)
+               return -ENOMEM;
+ 
+       regmap = devm_regmap_init_i2c(i2c_client, &cs42l42_regmap);
+       if (IS_ERR(regmap))
+               return dev_err_probe(&i2c_client->dev, PTR_ERR(regmap),
+                                    "regmap_init() failed\n");
+ 
+       cs42l42->devid = CS42L42_CHIP_ID;
+       cs42l42->dev = dev;
+       cs42l42->regmap = regmap;
+       cs42l42->irq = i2c_client->irq;
+ 
+       ret = cs42l42_common_probe(cs42l42, &cs42l42_soc_component, &cs42l42_dai);
+       if (ret)
+               return ret;
+ 
+       return cs42l42_init(cs42l42);
+ }
+ 
 -
 -      return 0;
++static void cs42l42_i2c_remove(struct i2c_client *i2c_client)
+ {
+       struct cs42l42_private *cs42l42 = dev_get_drvdata(&i2c_client->dev);
+ 
+       cs42l42_common_remove(cs42l42);
+ }
+ 
+ static int __maybe_unused cs42l42_i2c_resume(struct device *dev)
+ {
+       int ret;
+ 
+       ret = cs42l42_resume(dev);
+       if (ret)
+               return ret;
+ 
+       cs42l42_resume_restore(dev);
+ 
+       return 0;
+ }
+ 
+ static const struct dev_pm_ops cs42l42_i2c_pm_ops = {
+       SET_SYSTEM_SLEEP_PM_OPS(cs42l42_suspend, cs42l42_i2c_resume)
+ };
+ 
+ static const struct of_device_id __maybe_unused cs42l42_of_match[] = {
+       { .compatible = "cirrus,cs42l42", },
+       {}
+ };
+ MODULE_DEVICE_TABLE(of, cs42l42_of_match);
+ 
+ static const struct acpi_device_id __maybe_unused cs42l42_acpi_match[] = {
+       {"10134242", 0,},
+       {}
+ };
+ MODULE_DEVICE_TABLE(acpi, cs42l42_acpi_match);
+ 
+ static const struct i2c_device_id cs42l42_id[] = {
+       {"cs42l42", 0},
+       {}
+ };
+ 
+ MODULE_DEVICE_TABLE(i2c, cs42l42_id);
+ 
+ static struct i2c_driver cs42l42_i2c_driver = {
+       .driver = {
+               .name = "cs42l42",
+               .pm = &cs42l42_i2c_pm_ops,
+               .of_match_table = of_match_ptr(cs42l42_of_match),
+               .acpi_match_table = ACPI_PTR(cs42l42_acpi_match),
+               },
+       .id_table = cs42l42_id,
+       .probe_new = cs42l42_i2c_probe,
+       .remove = cs42l42_i2c_remove,
+ };
+ 
+ module_i2c_driver(cs42l42_i2c_driver);
+ 
+ MODULE_DESCRIPTION("ASoC CS42L42 I2C driver");
+ MODULE_AUTHOR("Richard Fitzgerald <rf@opensource.cirrus.com>");
+ MODULE_LICENSE("GPL");
+ MODULE_IMPORT_NS(SND_SOC_CS42L42_CORE);

diff --cc sound/soc/codecs/cs42l83-i2c.c
index 0000000,ba8772a..f90d439
mode 000000,100644..100644
--- /dev/null
--- 2/sound/soc/codecs/cs42l83-i2c.c
+++ b/sound/soc/codecs/cs42l83-i2c.c
@@@ -1,0 -1,242 +1,240 @@@
 -static int cs42l83_i2c_remove(struct i2c_client *i2c_client)
+ // SPDX-License-Identifier: GPL-2.0-only
+ /*
+  * cs42l83-i2c.c -- CS42L83 ALSA SoC audio driver for I2C
+  *
+  * Based on cs42l42-i2c.c:
+  *   Copyright 2016, 2022 Cirrus Logic, Inc.
+  */
+ 
+ #include <linux/i2c.h>
+ #include <linux/module.h>
+ #include <linux/regmap.h>
+ #include <linux/slab.h>
+ #include <linux/types.h>
+ 
+ #include "cs42l42.h"
+ 
+ static const struct reg_default cs42l83_reg_defaults[] = {
+       { CS42L42_FRZ_CTL,                      0x00 },
+       { CS42L42_SRC_CTL,                      0x10 },
+       { CS42L42_MCLK_CTL,                     0x00 }, /* <- only deviation from CS42L42 */
+       { CS42L42_SFTRAMP_RATE,                 0xA4 },
+       { CS42L42_SLOW_START_ENABLE,            0x70 },
+       { CS42L42_I2C_DEBOUNCE,                 0x88 },
+       { CS42L42_I2C_STRETCH,                  0x03 },
+       { CS42L42_I2C_TIMEOUT,                  0xB7 },
+       { CS42L42_PWR_CTL1,                     0xFF },
+       { CS42L42_PWR_CTL2,                     0x84 },
+       { CS42L42_PWR_CTL3,                     0x20 },
+       { CS42L42_RSENSE_CTL1,                  0x40 },
+       { CS42L42_RSENSE_CTL2,                  0x00 },
+       { CS42L42_OSC_SWITCH,                   0x00 },
+       { CS42L42_RSENSE_CTL3,                  0x1B },
+       { CS42L42_TSENSE_CTL,                   0x1B },
+       { CS42L42_TSRS_INT_DISABLE,             0x00 },
+       { CS42L42_HSDET_CTL1,                   0x77 },
+       { CS42L42_HSDET_CTL2,                   0x00 },
+       { CS42L42_HS_SWITCH_CTL,                0xF3 },
+       { CS42L42_HS_CLAMP_DISABLE,             0x00 },
+       { CS42L42_MCLK_SRC_SEL,                 0x00 },
+       { CS42L42_SPDIF_CLK_CFG,                0x00 },
+       { CS42L42_FSYNC_PW_LOWER,               0x00 },
+       { CS42L42_FSYNC_PW_UPPER,               0x00 },
+       { CS42L42_FSYNC_P_LOWER,                0xF9 },
+       { CS42L42_FSYNC_P_UPPER,                0x00 },
+       { CS42L42_ASP_CLK_CFG,                  0x00 },
+       { CS42L42_ASP_FRM_CFG,                  0x10 },
+       { CS42L42_FS_RATE_EN,                   0x00 },
+       { CS42L42_IN_ASRC_CLK,                  0x00 },
+       { CS42L42_OUT_ASRC_CLK,                 0x00 },
+       { CS42L42_PLL_DIV_CFG1,                 0x00 },
+       { CS42L42_ADC_OVFL_INT_MASK,            0x01 },
+       { CS42L42_MIXER_INT_MASK,               0x0F },
+       { CS42L42_SRC_INT_MASK,                 0x0F },
+       { CS42L42_ASP_RX_INT_MASK,              0x1F },
+       { CS42L42_ASP_TX_INT_MASK,              0x0F },
+       { CS42L42_CODEC_INT_MASK,               0x03 },
+       { CS42L42_SRCPL_INT_MASK,               0x7F },
+       { CS42L42_VPMON_INT_MASK,               0x01 },
+       { CS42L42_PLL_LOCK_INT_MASK,            0x01 },
+       { CS42L42_TSRS_PLUG_INT_MASK,           0x0F },
+       { CS42L42_PLL_CTL1,                     0x00 },
+       { CS42L42_PLL_DIV_FRAC0,                0x00 },
+       { CS42L42_PLL_DIV_FRAC1,                0x00 },
+       { CS42L42_PLL_DIV_FRAC2,                0x00 },
+       { CS42L42_PLL_DIV_INT,                  0x40 },
+       { CS42L42_PLL_CTL3,                     0x10 },
+       { CS42L42_PLL_CAL_RATIO,                0x80 },
+       { CS42L42_PLL_CTL4,                     0x03 },
+       { CS42L42_LOAD_DET_EN,                  0x00 },
+       { CS42L42_HSBIAS_SC_AUTOCTL,            0x03 },
+       { CS42L42_WAKE_CTL,                     0xC0 },
+       { CS42L42_ADC_DISABLE_MUTE,             0x00 },
+       { CS42L42_TIPSENSE_CTL,                 0x02 },
+       { CS42L42_MISC_DET_CTL,                 0x03 },
+       { CS42L42_MIC_DET_CTL1,                 0x1F },
+       { CS42L42_MIC_DET_CTL2,                 0x2F },
+       { CS42L42_DET_INT1_MASK,                0xE0 },
+       { CS42L42_DET_INT2_MASK,                0xFF },
+       { CS42L42_HS_BIAS_CTL,                  0xC2 },
+       { CS42L42_ADC_CTL,                      0x00 },
+       { CS42L42_ADC_VOLUME,                   0x00 },
+       { CS42L42_ADC_WNF_HPF_CTL,              0x71 },
+       { CS42L42_DAC_CTL1,                     0x00 },
+       { CS42L42_DAC_CTL2,                     0x02 },
+       { CS42L42_HP_CTL,                       0x0D },
+       { CS42L42_CLASSH_CTL,                   0x07 },
+       { CS42L42_MIXER_CHA_VOL,                0x3F },
+       { CS42L42_MIXER_ADC_VOL,                0x3F },
+       { CS42L42_MIXER_CHB_VOL,                0x3F },
+       { CS42L42_EQ_COEF_IN0,                  0x00 },
+       { CS42L42_EQ_COEF_IN1,                  0x00 },
+       { CS42L42_EQ_COEF_IN2,                  0x00 },
+       { CS42L42_EQ_COEF_IN3,                  0x00 },
+       { CS42L42_EQ_COEF_RW,                   0x00 },
+       { CS42L42_EQ_COEF_OUT0,                 0x00 },
+       { CS42L42_EQ_COEF_OUT1,                 0x00 },
+       { CS42L42_EQ_COEF_OUT2,                 0x00 },
+       { CS42L42_EQ_COEF_OUT3,                 0x00 },
+       { CS42L42_EQ_INIT_STAT,                 0x00 },
+       { CS42L42_EQ_START_FILT,                0x00 },
+       { CS42L42_EQ_MUTE_CTL,                  0x00 },
+       { CS42L42_SP_RX_CH_SEL,                 0x04 },
+       { CS42L42_SP_RX_ISOC_CTL,               0x04 },
+       { CS42L42_SP_RX_FS,                     0x8C },
+       { CS42l42_SPDIF_CH_SEL,                 0x0E },
+       { CS42L42_SP_TX_ISOC_CTL,               0x04 },
+       { CS42L42_SP_TX_FS,                     0xCC },
+       { CS42L42_SPDIF_SW_CTL1,                0x3F },
+       { CS42L42_SRC_SDIN_FS,                  0x40 },
+       { CS42L42_SRC_SDOUT_FS,                 0x40 },
+       { CS42L42_SPDIF_CTL1,                   0x01 },
+       { CS42L42_SPDIF_CTL2,                   0x00 },
+       { CS42L42_SPDIF_CTL3,                   0x00 },
+       { CS42L42_SPDIF_CTL4,                   0x42 },
+       { CS42L42_ASP_TX_SZ_EN,                 0x00 },
+       { CS42L42_ASP_TX_CH_EN,                 0x00 },
+       { CS42L42_ASP_TX_CH_AP_RES,             0x0F },
+       { CS42L42_ASP_TX_CH1_BIT_MSB,           0x00 },
+       { CS42L42_ASP_TX_CH1_BIT_LSB,           0x00 },
+       { CS42L42_ASP_TX_HIZ_DLY_CFG,           0x00 },
+       { CS42L42_ASP_TX_CH2_BIT_MSB,           0x00 },
+       { CS42L42_ASP_TX_CH2_BIT_LSB,           0x00 },
+       { CS42L42_ASP_RX_DAI0_EN,               0x00 },
+       { CS42L42_ASP_RX_DAI0_CH1_AP_RES,       0x03 },
+       { CS42L42_ASP_RX_DAI0_CH1_BIT_MSB,      0x00 },
+       { CS42L42_ASP_RX_DAI0_CH1_BIT_LSB,      0x00 },
+       { CS42L42_ASP_RX_DAI0_CH2_AP_RES,       0x03 },
+       { CS42L42_ASP_RX_DAI0_CH2_BIT_MSB,      0x00 },
+       { CS42L42_ASP_RX_DAI0_CH2_BIT_LSB,      0x00 },
+       { CS42L42_ASP_RX_DAI0_CH3_AP_RES,       0x03 },
+       { CS42L42_ASP_RX_DAI0_CH3_BIT_MSB,      0x00 },
+       { CS42L42_ASP_RX_DAI0_CH3_BIT_LSB,      0x00 },
+       { CS42L42_ASP_RX_DAI0_CH4_AP_RES,       0x03 },
+       { CS42L42_ASP_RX_DAI0_CH4_BIT_MSB,      0x00 },
+       { CS42L42_ASP_RX_DAI0_CH4_BIT_LSB,      0x00 },
+       { CS42L42_ASP_RX_DAI1_CH1_AP_RES,       0x03 },
+       { CS42L42_ASP_RX_DAI1_CH1_BIT_MSB,      0x00 },
+       { CS42L42_ASP_RX_DAI1_CH1_BIT_LSB,      0x00 },
+       { CS42L42_ASP_RX_DAI1_CH2_AP_RES,       0x03 },
+       { CS42L42_ASP_RX_DAI1_CH2_BIT_MSB,      0x00 },
+       { CS42L42_ASP_RX_DAI1_CH2_BIT_LSB,      0x00 },
+ };
+ 
+ /*
+  * This is all the same as for CS42L42 but we
+  * replace the on-reset register defaults.
+  */
+ const struct regmap_config cs42l83_regmap = {
+       .reg_bits = 8,
+       .val_bits = 8,
+ 
+       .readable_reg = cs42l42_readable_register,
+       .volatile_reg = cs42l42_volatile_register,
+ 
+       .ranges = &cs42l42_page_range,
+       .num_ranges = 1,
+ 
+       .max_register = CS42L42_MAX_REGISTER,
+       .reg_defaults = cs42l83_reg_defaults,
+       .num_reg_defaults = ARRAY_SIZE(cs42l83_reg_defaults),
+       .cache_type = REGCACHE_RBTREE,
+ 
+       .use_single_read = true,
+       .use_single_write = true,
+ };
+ 
+ static int cs42l83_i2c_probe(struct i2c_client *i2c_client)
+ {
+       struct device *dev = &i2c_client->dev;
+       struct cs42l42_private *cs42l83;
+       struct regmap *regmap;
+       int ret;
+ 
+       cs42l83 = devm_kzalloc(dev, sizeof(*cs42l83), GFP_KERNEL);
+       if (!cs42l83)
+               return -ENOMEM;
+ 
+       regmap = devm_regmap_init_i2c(i2c_client, &cs42l83_regmap);
+       if (IS_ERR(regmap))
+               return dev_err_probe(&i2c_client->dev, PTR_ERR(regmap),
+                                    "regmap_init() failed\n");
+ 
+       cs42l83->devid = CS42L83_CHIP_ID;
+       cs42l83->dev = dev;
+       cs42l83->regmap = regmap;
+       cs42l83->irq = i2c_client->irq;
+ 
+       ret = cs42l42_common_probe(cs42l83, &cs42l42_soc_component, &cs42l42_dai);
+       if (ret)
+               return ret;
+ 
+       return cs42l42_init(cs42l83);
+ }
+ 
 -
 -      return 0;
++static void cs42l83_i2c_remove(struct i2c_client *i2c_client)
+ {
+       struct cs42l42_private *cs42l83 = dev_get_drvdata(&i2c_client->dev);
+ 
+       cs42l42_common_remove(cs42l83);
+ }
+ 
+ static int __maybe_unused cs42l83_i2c_resume(struct device *dev)
+ {
+       int ret;
+ 
+       ret = cs42l42_resume(dev);
+       if (ret)
+               return ret;
+ 
+       cs42l42_resume_restore(dev);
+ 
+       return 0;
+ }
+ 
+ static const struct dev_pm_ops cs42l83_i2c_pm_ops = {
+       SET_SYSTEM_SLEEP_PM_OPS(cs42l42_suspend, cs42l83_i2c_resume)
+ };
+ 
+ static const struct of_device_id __maybe_unused cs42l83_of_match[] = {
+       { .compatible = "cirrus,cs42l83", },
+       {}
+ };
+ MODULE_DEVICE_TABLE(of, cs42l83_of_match);
+ 
+ static struct i2c_driver cs42l83_i2c_driver = {
+       .driver = {
+               .name = "cs42l83",
+               .pm = &cs42l83_i2c_pm_ops,
+               .of_match_table = of_match_ptr(cs42l83_of_match),
+               },
+       .probe_new = cs42l83_i2c_probe,
+       .remove = cs42l83_i2c_remove,
+ };
+ 
+ module_i2c_driver(cs42l83_i2c_driver);
+ 
+ MODULE_DESCRIPTION("ASoC CS42L83 I2C driver");
+ MODULE_AUTHOR("Martin Povišer <povik+lin@cutebit.org>");
+ MODULE_LICENSE("GPL");
+ MODULE_IMPORT_NS(SND_SOC_CS42L42_CORE);

diff --cc sound/soc/codecs/cs43130.c
Simple merge

diff --cc sound/soc/codecs/mt6660.c
Simple merge

diff --cc sound/soc/codecs/nau8825.c
Simple merge

diff --cc sound/soc/codecs/rt5682s.c
Simple merge