From: Mark Brown Date: Wed, 2 Jun 2021 16:12:45 +0000 (+0100) Subject: Merge remote-tracking branch 'asoc/for-5.14' into asoc-next X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=385247d1d50e7fb21d902e4fb4c81351130f6302;p=users%2Fjedix%2Flinux-maple.git Merge remote-tracking branch 'asoc/for-5.14' into asoc-next --- 385247d1d50e7fb21d902e4fb4c81351130f6302 diff --cc MAINTAINERS index 503fd21901f10,33079fddc7b8d..b4094f07214ea --- a/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 + 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 R: Charles Gorand L: linux-nfc@lists.01.org (moderated for non-subscribers) S: Supported diff --cc sound/soc/codecs/cs43130.c index 80cd3ea0c1577,7c521bd6b040f..44b20c1ef8517 --- a/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},