Skip to content

Commit 86d0d3e

Browse files
tiwaitiwai
committed
Merge tag 'asoc-fix-v6.14-merge-window' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.14 A bunch of fixes that came in during the merge window, plus a few new device IDs. The i.MX changes are a little large since they add some new quirk data as well as device IDs, and the audio graph card change for picking the correct endpoint for links is large due to updating a number of call sites.
2 parents 3b43095 + 6c1bb40 commit 86d0d3e

File tree

22 files changed

+205
-68
lines changed

22 files changed

+205
-68
lines changed

‎Documentation/devicetree/bindings/arm/fsl.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,6 +1091,7 @@ properties:
10911091
- dmo,imx8mp-data-modul-edm-sbc # i.MX8MP eDM SBC
10921092
- emcraft,imx8mp-navqp # i.MX8MP Emcraft Systems NavQ+ Kit
10931093
- fsl,imx8mp-evk # i.MX8MP EVK Board
1094+
- fsl,imx8mp-evk-revb4 # i.MX8MP EVK Rev B4 Board
10941095
- gateworks,imx8mp-gw71xx-2x # i.MX8MP Gateworks Board
10951096
- gateworks,imx8mp-gw72xx-2x # i.MX8MP Gateworks Board
10961097
- gateworks,imx8mp-gw73xx-2x # i.MX8MP Gateworks Board
@@ -1262,6 +1263,7 @@ properties:
12621263
items:
12631264
- enum:
12641265
- fsl,imx8qm-mek # i.MX8QM MEK Board
1266+
- fsl,imx8qm-mek-revd # i.MX8QM MEK Rev D Board
12651267
- toradex,apalis-imx8 # Apalis iMX8 Modules
12661268
- toradex,apalis-imx8-v1.1 # Apalis iMX8 V1.1 Modules
12671269
- const: fsl,imx8qm
@@ -1290,6 +1292,7 @@ properties:
12901292
- enum:
12911293
- einfochips,imx8qxp-ai_ml # i.MX8QXP AI_ML Board
12921294
- fsl,imx8qxp-mek # i.MX8QXP MEK Board
1295+
- fsl,imx8qxp-mek-wcpu # i.MX8QXP MEK WCPU Board
12931296
- const: fsl,imx8qxp
12941297

12951298
- description: i.MX8DXL based Boards

‎Documentation/devicetree/bindings/sound/ti,pcm1681.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
$id: http://devicetree.org/schemas/sound/ti,pcm1681.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Texas Instruments PCM1681 8-channel PWM Processor
7+
title: Texas Instruments PCM1681 8-channel Digital-to-Analog Converter
88

99
maintainers:
1010
- Shenghao Ding <shenghao-ding@ti.com>

‎drivers/firmware/cirrus/Kconfig

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@ config FW_CS_DSP
66

77
config FW_CS_DSP_KUNIT_TEST_UTILS
88
tristate
9-
depends on KUNIT
10-
select REGMAP
9+
depends on KUNIT && REGMAP
1110
select FW_CS_DSP
1211

1312
config FW_CS_DSP_KUNIT_TEST
1413
tristate "KUnit tests for Cirrus Logic cs_dsp" if !KUNIT_ALL_TESTS
15-
depends on KUNIT
14+
depends on KUNIT && REGMAP
1615
default KUNIT_ALL_TESTS
17-
select REGMAP
1816
select FW_CS_DSP
1917
select FW_CS_DSP_KUNIT_TEST_UTILS
2018
help

‎sound/soc/amd/acp/acp-i2s.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ static int acp_i2s_set_tdm_slot(struct snd_soc_dai *dai, u32 tx_mask, u32 rx_mas
181181
break;
182182
default:
183183
dev_err(dev, "Unknown chip revision %d\n", chip->acp_rev);
184+
spin_unlock_irq(&adata->acp_lock);
184185
return -EINVAL;
185186
}
186187
}

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,34 @@ static const struct dmi_system_id yc_acp_quirk_table[] = {
304304
DMI_MATCH(DMI_PRODUCT_NAME, "83AS"),
305305
}
306306
},
307+
{
308+
.driver_data = &acp6x_card,
309+
.matches = {
310+
DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
311+
DMI_MATCH(DMI_PRODUCT_NAME, "83L3"),
312+
}
313+
},
314+
{
315+
.driver_data = &acp6x_card,
316+
.matches = {
317+
DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
318+
DMI_MATCH(DMI_PRODUCT_NAME, "83N6"),
319+
}
320+
},
321+
{
322+
.driver_data = &acp6x_card,
323+
.matches = {
324+
DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
325+
DMI_MATCH(DMI_PRODUCT_NAME, "83Q2"),
326+
}
327+
},
328+
{
329+
.driver_data = &acp6x_card,
330+
.matches = {
331+
DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
332+
DMI_MATCH(DMI_PRODUCT_NAME, "83Q3"),
333+
}
334+
},
307335
{
308336
.driver_data = &acp6x_card,
309337
.matches = {

‎sound/soc/codecs/da7213.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2203,6 +2203,8 @@ static int da7213_i2c_probe(struct i2c_client *i2c)
22032203
return ret;
22042204
}
22052205

2206+
mutex_init(&da7213->ctrl_lock);
2207+
22062208
pm_runtime_set_autosuspend_delay(&i2c->dev, 100);
22072209
pm_runtime_use_autosuspend(&i2c->dev);
22082210
pm_runtime_set_active(&i2c->dev);

‎sound/soc/codecs/es8316.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ static const struct snd_kcontrol_new es8316_snd_controls[] = {
101101
SOC_DOUBLE_R_TLV("DAC Playback Volume", ES8316_DAC_VOLL,
102102
ES8316_DAC_VOLR, 0, 0xc0, 1, dac_vol_tlv),
103103
SOC_SINGLE("DAC Soft Ramp Switch", ES8316_DAC_SET1, 4, 1, 1),
104-
SOC_SINGLE("DAC Soft Ramp Rate", ES8316_DAC_SET1, 2, 4, 0),
104+
SOC_SINGLE("DAC Soft Ramp Rate", ES8316_DAC_SET1, 2, 3, 0),
105105
SOC_SINGLE("DAC Notch Filter Switch", ES8316_DAC_SET2, 6, 1, 0),
106106
SOC_SINGLE("DAC Double Fs Switch", ES8316_DAC_SET2, 7, 1, 0),
107107
SOC_SINGLE("DAC Stereo Enhancement", ES8316_DAC_SET3, 0, 7, 0),

‎sound/soc/codecs/es8326.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@ static void es8326_jack_detect_handler(struct work_struct *work)
911911
regmap_write(es8326->regmap, ES8326_INT_SOURCE,
912912
(ES8326_INT_SRC_PIN9 | ES8326_INT_SRC_BUTTON));
913913
regmap_write(es8326->regmap, ES8326_SYS_BIAS, 0x1f);
914-
regmap_update_bits(es8326->regmap, ES8326_HP_DRIVER_REF, 0x0f, 0x08);
914+
regmap_update_bits(es8326->regmap, ES8326_HP_DRIVER_REF, 0x0f, 0x0d);
915915
queue_delayed_work(system_wq, &es8326->jack_detect_work,
916916
msecs_to_jiffies(400));
917917
es8326->hp = 1;
@@ -1023,7 +1023,7 @@ static void es8326_init(struct snd_soc_component *component)
10231023
struct es8326_priv *es8326 = snd_soc_component_get_drvdata(component);
10241024

10251025
regmap_write(es8326->regmap, ES8326_RESET, 0x1f);
1026-
regmap_write(es8326->regmap, ES8326_VMIDSEL, 0x0E);
1026+
regmap_write(es8326->regmap, ES8326_VMIDSEL, 0x3E);
10271027
regmap_write(es8326->regmap, ES8326_ANA_LP, 0xf0);
10281028
usleep_range(10000, 15000);
10291029
regmap_write(es8326->regmap, ES8326_HPJACK_TIMER, 0xd9);

‎sound/soc/codecs/rt5514.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,8 +1091,7 @@ static int rt5514_set_bias_level(struct snd_soc_component *component,
10911091
static int rt5514_probe(struct snd_soc_component *component)
10921092
{
10931093
struct rt5514_priv *rt5514 = snd_soc_component_get_drvdata(component);
1094-
struct platform_device *pdev = container_of(component->dev,
1095-
struct platform_device, dev);
1094+
struct platform_device *pdev = to_platform_device(component->dev);
10961095

10971096
rt5514->mclk = devm_clk_get_optional(component->dev, "mclk");
10981097
if (IS_ERR(rt5514->mclk))

‎sound/soc/fsl/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ comment "Common SoC Audio options for Freescale CPUs:"
66
config SND_SOC_FSL_ASRC
77
tristate "Asynchronous Sample Rate Converter (ASRC) module support"
88
depends on HAS_DMA
9+
select DMA_SHARED_BUFFER
910
select REGMAP_MMIO
1011
select SND_SOC_GENERIC_DMAENGINE_PCM
1112
select SND_COMPRESS_ACCEL

0 commit comments

Comments
 (0)