Merge series "ASoC: tlv320aic32x4: Add support for TAS2505" from Claudius Heine ...

Hi,

this is v2 from my patchset that add support for the TAS2505 to the tlv320aic32x4 driver.

kind regards,
Claudius

Changes from v1:
- clarified commit message of first patch, which add the type value to the struct
- removed unnecessary code to put and get speaker volume
- removed 'Gain' from 'HP Driver Playback Volume' control
- fixed rebase issues

Claudius Heine (3):
  ASoC: tlv320aic32x4: add type to device private data struct
  ASoC: tlv320aic32x4: add support for TAS2505
  ASoC: tlv320aic32x4: dt-bindings: add TAS2505 to compatible

 .../bindings/sound/tlv320aic32x4.txt          |   1 +
 sound/soc/codecs/tlv320aic32x4-i2c.c          |  22 ++-
 sound/soc/codecs/tlv320aic32x4-spi.c          |  23 ++-
 sound/soc/codecs/tlv320aic32x4.c              | 139 +++++++++++++++++-
 sound/soc/codecs/tlv320aic32x4.h              |  10 ++
 5 files changed, 186 insertions(+), 9 deletions(-)

base-commit: 70585216fe7730d9fb5453d3e2804e149d0fe201
--
2.32.0

diff --cc MAINTAINERS
index 33079fddc7b8dc17158b766df306d369574b3d11,bc0ceef87b73f7aaa7a0f66e12e27a387098f413..516a9fead7e3b3ba205461294122cbad780b2b55
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -13204,17 -13214,9 +13214,16 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/sound/tfa9879.txt
  F:    sound/soc/codecs/tfa9879*
  
 +NXP/Goodix TFA989X (TFA1) DRIVER
 +M:    Stephan Gerhold <stephan@gerhold.net>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml
 +F:    sound/soc/codecs/tfa989x.c
 +
  NXP-NCI NFC DRIVER
- M:    Clément Perrochaud <clement.perrochaud@effinnov.com>
  R:    Charles Gorand <charles.gorand@effinnov.com>
- L:    linux-nfc@lists.01.org (moderated for non-subscribers)
+ L:    linux-nfc@lists.01.org (subscribers-only)
  S:    Supported
  F:    drivers/nfc/nxp-nci
  

diff --cc sound/soc/codecs/cs43130.c
index 7c521bd6b040f5829d077b0c144757f355ce0543,80cd3ea0c1577261b8df0ecee488ad8b198dc025..44b20c1ef85173dd72dce26de9d464be9a0dad5a
--- 1/sound/soc/codecs/cs43130.c
--- 2/sound/soc/codecs/cs43130.c
+++ b/sound/soc/codecs/cs43130.c
@@@ -1731,11 -1730,19 +1731,19 @@@ static ssize_t hpload_ac_r_show(struct 
        return cs43130_show_ac(dev, buf, HP_RIGHT);
  }
  
 -static DEVICE_ATTR(hpload_dc_l, 0444, cs43130_show_dc_l, NULL);
 -static DEVICE_ATTR(hpload_dc_r, 0444, cs43130_show_dc_r, NULL);
 -static DEVICE_ATTR(hpload_ac_l, 0444, cs43130_show_ac_l, NULL);
 -static DEVICE_ATTR(hpload_ac_r, 0444, cs43130_show_ac_r, NULL);
 +static DEVICE_ATTR_RO(hpload_dc_l);
 +static DEVICE_ATTR_RO(hpload_dc_r);
 +static DEVICE_ATTR_RO(hpload_ac_l);
 +static DEVICE_ATTR_RO(hpload_ac_r);
  
+ static struct attribute *hpload_attrs[] = {
+       &dev_attr_hpload_dc_l.attr,
+       &dev_attr_hpload_dc_r.attr,
+       &dev_attr_hpload_ac_l.attr,
+       &dev_attr_hpload_ac_r.attr,
+ };
+ ATTRIBUTE_GROUPS(hpload);
+ 
  static struct reg_sequence hp_en_cal_seq[] = {
        {CS43130_INT_MASK_4, CS43130_INT_MASK_ALL},
        {CS43130_HP_MEAS_LOAD_1, 0},

diff --cc sound/soc/fsl/fsl-asoc-card.c
Simple merge

diff --cc sound/soc/qcom/lpass-cpu.c
Simple merge

diff --cc sound/soc/qcom/lpass.h
Simple merge

diff --cc sound/soc/soc-topology.c
Simple merge