Commit 932adbed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ASoC: Fix SND_SOC_ALL_CODECS handling of dual SPI and I2C control buses
  ASoC: Use snd_soc_dapm_nc_pin() in at91sam9g20ek
  ASoC: TWL4030: Convert the bitfield enums to VALUE_ENUM type
  ASoC: New enum type: value_enum
  pxa2xx-ac97: switch AC unit to correct state before probing
  ASoC: Clocking fixes for davinci-evm.c
  ASoC: Mark non-connected TWL4030 pins for pandora
  ASoC: OMAP: Select OMAP pin multiplexing when using Nokia N810 ASoC drivers
parents ce519e23 16796819

include/sound/soc-dapm.h

+15 −0
Original line number Diff line number Diff line
@@ -85,6 +85,10 @@ 
#define SND_SOC_DAPM_MUX(wname, wreg, wshift, winvert, wcontrols) \

{	.id = snd_soc_dapm_mux, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1}

#define SND_SOC_DAPM_VALUE_MUX(wname, wreg, wshift, winvert, wcontrols) \

{	.id = snd_soc_dapm_value_mux, .name = wname, .reg = wreg, \

	.shift = wshift, .invert = winvert, .kcontrols = wcontrols, \

	.num_kcontrols = 1}



/* path domain with event - event handler must return 0 for success */

#define SND_SOC_DAPM_PGA_E(wname, wreg, wshift, winvert, wcontrols, \
@@ -172,6 +176,12 @@ 
 	.get = snd_soc_dapm_get_enum_double, \

 	.put = snd_soc_dapm_put_enum_double, \

  	.private_value = (unsigned long)&xenum }

#define SOC_DAPM_VALUE_ENUM(xname, xenum) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \

	.info = snd_soc_info_value_enum_double, \

	.get = snd_soc_dapm_get_value_enum_double, \

	.put = snd_soc_dapm_put_value_enum_double, \

	.private_value = (unsigned long)&xenum }



/* dapm stream operations */

#define SND_SOC_DAPM_STREAM_NOP			0x0
@@ -214,6 +224,10 @@ int snd_soc_dapm_get_enum_double(struct snd_kcontrol *kcontrol, 
	struct snd_ctl_elem_value *ucontrol);

int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_dapm_get_value_enum_double(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_dapm_put_value_enum_double(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_dapm_new_control(struct snd_soc_codec *codec,

	const struct snd_soc_dapm_widget *widget);

int snd_soc_dapm_new_controls(struct snd_soc_codec *codec,
@@ -247,6 +261,7 @@ enum snd_soc_dapm_type { 
	snd_soc_dapm_input = 0,		/* input pin */

	snd_soc_dapm_output,		/* output pin */

	snd_soc_dapm_mux,			/* selects 1 analog signal from many inputs */

	snd_soc_dapm_value_mux,			/* selects 1 analog signal from many inputs */

	snd_soc_dapm_mixer,			/* mixes several analog signals together */

	snd_soc_dapm_pga,			/* programmable gain/attenuation (volume) */

	snd_soc_dapm_adc,			/* analog to digital converter */

include/sound/soc.h

+30 −0
Original line number Diff line number Diff line
@@ -94,11 +94,22 @@ 
	SOC_ENUM_DOUBLE(xreg, xshift, xshift, xmax, xtexts)

#define SOC_ENUM_SINGLE_EXT(xmax, xtexts) \

{	.max = xmax, .texts = xtexts }

#define SOC_VALUE_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmask, xmax, xtexts, xvalues) \

{	.reg = xreg, .shift_l = xshift_l, .shift_r = xshift_r, \

	.mask = xmask, .max = xmax, .texts = xtexts, .values = xvalues}

#define SOC_VALUE_ENUM_SINGLE(xreg, xshift, xmask, xmax, xtexts, xvalues) \

	SOC_VALUE_ENUM_DOUBLE(xreg, xshift, xshift, xmask, xmax, xtexts, xvalues)

#define SOC_ENUM(xname, xenum) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,\

	.info = snd_soc_info_enum_double, \

	.get = snd_soc_get_enum_double, .put = snd_soc_put_enum_double, \

	.private_value = (unsigned long)&xenum }

#define SOC_VALUE_ENUM(xname, xenum) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,\

	.info = snd_soc_info_value_enum_double, \

	.get = snd_soc_get_value_enum_double, \

	.put = snd_soc_put_value_enum_double, \

	.private_value = (unsigned long)&xenum }

#define SOC_SINGLE_EXT(xname, xreg, xshift, xmax, xinvert,\

	 xhandler_get, xhandler_put) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
@@ -200,6 +211,12 @@ int snd_soc_get_enum_double(struct snd_kcontrol *kcontrol, 
	struct snd_ctl_elem_value *ucontrol);

int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_info_value_enum_double(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_info *uinfo);

int snd_soc_get_value_enum_double(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_put_value_enum_double(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_info_volsw(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_info *uinfo);

int snd_soc_info_volsw_ext(struct snd_kcontrol *kcontrol,
@@ -406,6 +423,19 @@ struct soc_enum { 
	void *dapm;

};



/* semi enumerated kcontrol */

struct soc_value_enum {

	unsigned short reg;

	unsigned short reg2;

	unsigned char shift_l;

	unsigned char shift_r;

	unsigned int max;

	unsigned int mask;

	const char **texts;

	const unsigned int *values;

	void *dapm;

};



#include <sound/soc-dai.h>



#endif

sound/arm/pxa2xx-ac97-lib.c

+16 −9
Original line number Diff line number Diff line
@@ -321,10 +321,6 @@ int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev) 
{

	int ret;



	ret = request_irq(IRQ_AC97, pxa2xx_ac97_irq, 0, "AC97", NULL);

	if (ret < 0)

		goto err;



	if (cpu_is_pxa25x() || cpu_is_pxa27x()) {

		pxa_gpio_mode(GPIO31_SYNC_AC97_MD);

		pxa_gpio_mode(GPIO30_SDATA_OUT_AC97_MD);
@@ -339,7 +335,7 @@ int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev) 
		if (IS_ERR(ac97conf_clk)) {

			ret = PTR_ERR(ac97conf_clk);

			ac97conf_clk = NULL;

			goto err_irq;

			goto err_conf;

		}

	}
@@ -347,19 +343,30 @@ int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev) 
	if (IS_ERR(ac97_clk)) {

		ret = PTR_ERR(ac97_clk);

		ac97_clk = NULL;

		goto err_irq;

		goto err_clk;

	}



	return clk_enable(ac97_clk);

	ret = clk_enable(ac97_clk);

	if (ret)

		goto err_clk2;



	ret = request_irq(IRQ_AC97, pxa2xx_ac97_irq, IRQF_DISABLED, "AC97", NULL);

	if (ret < 0)

		goto err_irq;



	return 0;



err_irq:

	GCR |= GCR_ACLINK_OFF;

err_clk2:

	clk_put(ac97_clk);

	ac97_clk = NULL;

err_clk:

	if (ac97conf_clk) {

		clk_put(ac97conf_clk);

		ac97conf_clk = NULL;

	}

	free_irq(IRQ_AC97, NULL);

err:

err_conf:

	return ret;

}

EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_probe);

sound/soc/atmel/sam9g20_wm8731.c

+2 −2
Original line number Diff line number Diff line
@@ -221,8 +221,8 @@ static int at91sam9g20ek_wm8731_init(struct snd_soc_codec *codec) 
	snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));



	/* not connected */

	snd_soc_dapm_disable_pin(codec, "RLINEIN");

	snd_soc_dapm_disable_pin(codec, "LLINEIN");

	snd_soc_dapm_nc_pin(codec, "RLINEIN");

	snd_soc_dapm_nc_pin(codec, "LLINEIN");



	/* always connected */

	snd_soc_dapm_enable_pin(codec, "Int Mic");

sound/soc/codecs/Kconfig

+15 −5
Original line number Diff line number Diff line 
# Helper to resolve issues with configs that have SPI enabled but I2C

# modular, meaning we can't build the codec driver in with I2C support.

# We use an ordered list of conditional defaults to pick the appropriate

# setting - SPI can't be modular so that case doesn't need to be covered.

config SND_SOC_I2C_AND_SPI

	tristate

	default m if I2C=m

	default y if I2C=y

	default y if SPI_MASTER=y



config SND_SOC_ALL_CODECS

	tristate "Build all ASoC CODEC drivers"

	select SND_SOC_AC97_CODEC if SND_SOC_AC97_BUS
@@ -14,12 +24,12 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_UDA134X

	select SND_SOC_UDA1380 if I2C

	select SND_SOC_WM8350 if MFD_WM8350

	select SND_SOC_WM8510 if (I2C || SPI_MASTER)

	select SND_SOC_WM8510 if SND_SOC_I2C_AND_SPI

	select SND_SOC_WM8580 if I2C

	select SND_SOC_WM8728 if (I2C || SPI_MASTER)

	select SND_SOC_WM8731 if (I2C || SPI_MASTER)

	select SND_SOC_WM8750 if (I2C || SPI_MASTER)

	select SND_SOC_WM8753 if (I2C || SPI_MASTER)

	select SND_SOC_WM8728 if SND_SOC_I2C_AND_SPI

	select SND_SOC_WM8731 if SND_SOC_I2C_AND_SPI

	select SND_SOC_WM8750 if SND_SOC_I2C_AND_SPI

	select SND_SOC_WM8753 if SND_SOC_I2C_AND_SPI

	select SND_SOC_WM8900 if I2C

	select SND_SOC_WM8903 if I2C

	select SND_SOC_WM8971 if I2C

CRA Git | Maintained and supported by SUSTech CRA and CCSE