Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0933994d authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.1' into for-3.2

parents 78a262c8 ee1a4d4b

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -5532,6 +5532,7 @@ F: include/media/*7146* 


SAMSUNG AUDIO (ASoC) DRIVERS

M:	Jassi Brar <jassisinghbrar@gmail.com>

M:	Sangbeom Kim <sbkim73@samsung.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Supported

F:	sound/soc/samsung

sound/soc/samsung/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ config SND_SOC_SPEYSIDE 
	select SND_SAMSUNG_I2S

	select SND_SOC_WM8996

	select SND_SOC_WM9081

	select SND_SOC_WM1250_EV1



config SND_SOC_SPEYSIDE_WM8962

	tristate "Audio support for Wolfson Speyside with WM8962"

sound/soc/tegra/tegra_wm8903.c

+2 −2
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd) 
	snd_soc_dapm_force_enable_pin(dapm, "Mic Bias");



	/* FIXME: Calculate automatically based on DAPM routes? */

	if (!machine_is_harmony() && !machine_is_ventana())

	if (!machine_is_harmony())

		snd_soc_dapm_nc_pin(dapm, "IN1L");

	if (!machine_is_seaboard() && !machine_is_aebl())

		snd_soc_dapm_nc_pin(dapm, "IN1R");
@@ -395,7 +395,7 @@ static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, card);

	snd_soc_card_set_drvdata(card, machine);



	if (machine_is_harmony() || machine_is_ventana()) {

	if (machine_is_harmony()) {

		card->dapm_routes = harmony_audio_map;

		card->num_dapm_routes = ARRAY_SIZE(harmony_audio_map);

	} else if (machine_is_seaboard()) {