Merge remote-tracking branch 'asoc/for-5.14' into asoc-next

diff --cc MAINTAINERS
index 503fd21901f106b20835578713e49b9c7e9eb1cc,33079fddc7b8dc17158b766df306d369574b3d11..b4094f07214ea574c94408c9dc3ceb156b652ac4
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -13212,7 -13204,15 +13212,14 @@@ 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)
  S:    Supported

diff --cc sound/soc/codecs/cs43130.c
index 80cd3ea0c1577261b8df0ecee488ad8b198dc025,7c521bd6b040f5829d077b0c144757f355ce0543..44b20c1ef85173dd72dce26de9d464be9a0dad5a
--- 1/sound/soc/codecs/cs43130.c
--- 2/sound/soc/codecs/cs43130.c
+++ b/sound/soc/codecs/cs43130.c
@@@ -1730,19 -1731,11 +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/soc-topology.c
Simple merge