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

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

Merge branch 'fix/asoc' into for-linus

parents a0204283 cefcc03f

Documentation/sound/alsa/soc/machine.txt

+2 −4
Original line number Diff line number Diff line
@@ -50,8 +50,7 @@ Machine DAI Configuration 
The machine DAI configuration glues all the codec and CPU DAIs together. It can

also be used to set up the DAI system clock and for any machine related DAI

initialisation e.g. the machine audio map can be connected to the codec audio

map, unconnected codec pins can be set as such. Please see corgi.c, spitz.c

for examples.

map, unconnected codec pins can be set as such.



struct snd_soc_dai_link is used to set up each DAI in your machine. e.g.
@@ -83,8 +82,7 @@ Machine Power Map 
The machine driver can optionally extend the codec power map and to become an

audio power map of the audio subsystem. This allows for automatic power up/down

of speaker/HP amplifiers, etc. Codec pins can be connected to the machines jack

sockets in the machine init function. See soc/pxa/spitz.c and dapm.txt for

details.

sockets in the machine init function.





Machine Controls

sound/soc/codecs/uda1380.c

+2 −2
Original line number Diff line number Diff line
@@ -863,13 +863,13 @@ static struct i2c_driver uda1380_i2c_driver = { 


static int __init uda1380_modinit(void)

{

	int ret;

	int ret = 0;

#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)

	ret = i2c_add_driver(&uda1380_i2c_driver);

	if (ret != 0)

		pr_err("Failed to register UDA1380 I2C driver: %d\n", ret);

#endif

	return 0;

	return ret;

}

module_init(uda1380_modinit);

sound/soc/codecs/wm8994.c

+6 −6
Original line number Diff line number Diff line
@@ -1325,15 +1325,15 @@ SND_SOC_DAPM_DAC("DAC1R", NULL, WM8994_POWER_MANAGEMENT_5, 0, 0), 
};



static const struct snd_soc_dapm_widget wm8994_adc_revd_widgets[] = {

SND_SOC_DAPM_MUX_E("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux,

SND_SOC_DAPM_VIRT_MUX_E("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux,

			adc_mux_ev, SND_SOC_DAPM_PRE_PMU),

SND_SOC_DAPM_MUX_E("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux,

SND_SOC_DAPM_VIRT_MUX_E("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux,

			adc_mux_ev, SND_SOC_DAPM_PRE_PMU),

};



static const struct snd_soc_dapm_widget wm8994_adc_widgets[] = {

SND_SOC_DAPM_MUX("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux),

SND_SOC_DAPM_MUX("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux),

SND_SOC_DAPM_VIRT_MUX("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux),

SND_SOC_DAPM_VIRT_MUX("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux),

};



static const struct snd_soc_dapm_widget wm8994_dapm_widgets[] = {

sound/soc/imx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ config SND_MXC_SOC_WM1133_EV1 


config SND_SOC_MX27VIS_AIC32X4

	tristate "SoC audio support for Visstrim M10 boards"

	depends on MACH_IMX27_VISSTRIM_M10

	depends on MACH_IMX27_VISSTRIM_M10 && I2C

	select SND_SOC_TLV320AIC32X4

	select SND_MXC_SOC_MX2

	help

sound/soc/kirkwood/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ config SND_KIRKWOOD_SOC_I2S 
config SND_KIRKWOOD_SOC_OPENRD

	tristate "SoC Audio support for Kirkwood Openrd Client"

	depends on SND_KIRKWOOD_SOC && (MACH_OPENRD_CLIENT || MACH_OPENRD_ULTIMATE)

	depends on I2C

	select SND_KIRKWOOD_SOC_I2S

	select SND_SOC_CS42L51

	help
@@ -20,7 +21,7 @@ config SND_KIRKWOOD_SOC_OPENRD 


config SND_KIRKWOOD_SOC_T5325

	tristate "SoC Audio support for HP t5325"

	depends on SND_KIRKWOOD_SOC && MACH_T5325

	depends on SND_KIRKWOOD_SOC && MACH_T5325 && I2C

	select SND_KIRKWOOD_SOC_I2S

	select SND_SOC_ALC5623

	help