Commit 6bf5f9a8 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v6.2-3' of... 

Merge tag 'asoc-v6.2-3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v6.2

Some more small fixes and board quirks that came in since my last
update, the main one being the fixes from Kai for issues around the
attempts to get kexec working well on SOF based systems.
parents fd28941c a12a383e

sound/soc/codecs/lochnagar-sc.c

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ MODULE_DEVICE_TABLE(of, lochnagar_of_match); 
static struct platform_driver lochnagar_sc_codec_driver = {

	.driver = {

		.name = "lochnagar-soundcard",

		.of_match_table = of_match_ptr(lochnagar_of_match),

		.of_match_table = lochnagar_of_match,

	},



	.probe = lochnagar_sc_probe,

sound/soc/codecs/rt5670.c

+0 −2
Original line number Diff line number Diff line
@@ -3311,8 +3311,6 @@ static int rt5670_i2c_probe(struct i2c_client *i2c) 
	if (ret < 0)

		goto err;



	pm_runtime_put(&i2c->dev);



	return 0;

err:

	pm_runtime_disable(&i2c->dev);

sound/soc/codecs/wm8994.c

+5 −0
Original line number Diff line number Diff line
@@ -3853,7 +3853,12 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data) 
	} else {

		dev_dbg(component->dev, "Jack not detected\n");



		/* Release wm8994->accdet_lock to avoid deadlock:

		 * cancel_delayed_work_sync() takes wm8994->mic_work internal

		 * lock and wm1811_mic_work takes wm8994->accdet_lock */

		mutex_unlock(&wm8994->accdet_lock);

		cancel_delayed_work_sync(&wm8994->mic_work);

		mutex_lock(&wm8994->accdet_lock);



		snd_soc_component_update_bits(component, WM8958_MICBIAS2,

				    WM8958_MICB2_DISCH, WM8958_MICB2_DISCH);

sound/soc/intel/boards/bytcr_rt5640.c

+25 −0
Original line number Diff line number Diff line
@@ -570,6 +570,21 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { 
					BYT_RT5640_SSP0_AIF1 |

					BYT_RT5640_MCLK_EN),

	},

	{

		/* Advantech MICA-071 */

		.matches = {

			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Advantech"),

			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "MICA-071"),

		},

		/* OVCD Th = 1500uA to reliable detect head-phones vs -set */

		.driver_data = (void *)(BYT_RT5640_IN3_MAP |

					BYT_RT5640_JD_SRC_JD2_IN4N |

					BYT_RT5640_OVCD_TH_1500UA |

					BYT_RT5640_OVCD_SF_0P75 |

					BYT_RT5640_MONO_SPEAKER |

					BYT_RT5640_DIFF_MIC |

					BYT_RT5640_MCLK_EN),

	},

	{

		.matches = {

			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ARCHOS"),
@@ -796,6 +811,16 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { 
					BYT_RT5640_SSP0_AIF1 |

					BYT_RT5640_MCLK_EN),

	},

	{	/* HP Stream 8 */

		.matches = {

			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "HP Stream 8 Tablet"),

		},

		.driver_data = (void *)(BYTCR_INPUT_DEFAULTS |

					BYT_RT5640_JD_NOT_INV |

					BYT_RT5640_SSP0_AIF1 |

					BYT_RT5640_MCLK_EN),

	},

	{	/* I.T.Works TW891 */

		.matches = {

			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "To be filled by O.E.M."),

sound/soc/intel/common/soc-acpi-intel-rpl-match.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static const struct snd_soc_acpi_adr_device rt1316_1_group2_adr[] = { 


static const struct snd_soc_acpi_adr_device rt1318_1_group1_adr[] = {

	{

		.adr = 0x000131025D131801ull,

		.adr = 0x000132025D131801ull,

		.num_endpoints = 1,

		.endpoints = &spk_l_endpoint,

		.name_prefix = "rt1318-1"