Skip to content

Commit 3db9d4b

Browse files
committed
Merge tag 'asoc-fix-v6.8-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.8 A relatively large set of fixes and quirk additions here but they're all driver specific, people seem to be back into the swing of things after the holidays. This is all driver specific and much of it fairly minor.
2 parents 852d432 + 0db0c17 commit 3db9d4b

29 files changed

+378
-164
lines changed

Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Google SC7280-Herobrine ASoC sound card driver
88

99
maintainers:
10-
- Srinivasa Rao Mandadapu <srivasam@codeaurora.org>
1110
- Judy Hsiao <judyhsiao@chromium.org>
1211

1312
description:

include/sound/tas2781.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ struct tasdevice_priv {
142142

143143
void tas2781_reset(struct tasdevice_priv *tas_dev);
144144
int tascodec_init(struct tasdevice_priv *tas_priv, void *codec,
145+
struct module *module,
145146
void (*cont)(const struct firmware *fw, void *context));
146147
struct tasdevice_priv *tasdevice_kzalloc(struct i2c_client *i2c);
147148
int tasdevice_init(struct tasdevice_priv *tas_priv);

sound/pci/hda/tas2781_hda_i2c.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ static int tas2781_hda_bind(struct device *dev, struct device *master,
710710

711711
strscpy(comps->name, dev_name(dev), sizeof(comps->name));
712712

713-
ret = tascodec_init(tas_hda->priv, codec, tasdev_fw_ready);
713+
ret = tascodec_init(tas_hda->priv, codec, THIS_MODULE, tasdev_fw_ready);
714714
if (!ret)
715715
comps->playback_hook = tas2781_hda_playback_hook;
716716

sound/soc/amd/yc/acp6x-mach.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = {
234234
DMI_MATCH(DMI_PRODUCT_NAME, "82UG"),
235235
}
236236
},
237+
{
238+
.driver_data = &acp6x_card,
239+
.matches = {
240+
DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
241+
DMI_MATCH(DMI_PRODUCT_NAME, "82UU"),
242+
}
243+
},
237244
{
238245
.driver_data = &acp6x_card,
239246
.matches = {
@@ -248,6 +255,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = {
248255
DMI_MATCH(DMI_PRODUCT_NAME, "82YM"),
249256
}
250257
},
258+
{
259+
.driver_data = &acp6x_card,
260+
.matches = {
261+
DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
262+
DMI_MATCH(DMI_PRODUCT_NAME, "83AS"),
263+
}
264+
},
251265
{
252266
.driver_data = &acp6x_card,
253267
.matches = {

sound/soc/codecs/cs35l56-shared.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ static const struct reg_default cs35l56_reg_defaults[] = {
5151
{ CS35L56_SWIRE_DP3_CH2_INPUT, 0x00000019 },
5252
{ CS35L56_SWIRE_DP3_CH3_INPUT, 0x00000029 },
5353
{ CS35L56_SWIRE_DP3_CH4_INPUT, 0x00000028 },
54-
{ CS35L56_IRQ1_CFG, 0x00000000 },
5554
{ CS35L56_IRQ1_MASK_1, 0x83ffffff },
5655
{ CS35L56_IRQ1_MASK_2, 0xffff7fff },
5756
{ CS35L56_IRQ1_MASK_4, 0xe0ffffff },

0 commit comments

Comments
 (0)