Commit c0d018bd authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/adau1761', 'asoc/fix/fsl',... 

Merge remote-tracking branches 'asoc/fix/adau1761', 'asoc/fix/fsl', 'asoc/fix/intel', 'asoc/fix/s6000' and 'asoc/fix/sgtl5000' into asoc-linus
parents cac7f242 3b283f08 6aa256b6 2ccf3bd4 19c768db c171b120

Documentation/devicetree/bindings/sound/sgtl5000.txt

+10 −0
Original line number Diff line number Diff line
@@ -7,10 +7,20 @@ Required properties: 


- clocks : the clock provider of SYS_MCLK



- VDDA-supply : the regulator provider of VDDA



- VDDIO-supply: the regulator provider of VDDIO



Optional properties:



- VDDD-supply : the regulator provider of VDDD



Example:



codec: sgtl5000@0a {

	compatible = "fsl,sgtl5000";

	reg = <0x0a>;

	clocks = <&clks 150>;

	VDDA-supply = <&reg_3p3v>;

	VDDIO-supply = <&reg_3p3v>;

};

sound/soc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ source "sound/soc/mxs/Kconfig" 
source "sound/soc/pxa/Kconfig"

source "sound/soc/rockchip/Kconfig"

source "sound/soc/samsung/Kconfig"

source "sound/soc/s6000/Kconfig"

source "sound/soc/sh/Kconfig"

source "sound/soc/sirf/Kconfig"

source "sound/soc/spear/Kconfig"

sound/soc/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ obj-$(CONFIG_SND_SOC) += kirkwood/ 
obj-$(CONFIG_SND_SOC)	+= pxa/

obj-$(CONFIG_SND_SOC)	+= rockchip/

obj-$(CONFIG_SND_SOC)	+= samsung/

obj-$(CONFIG_SND_SOC)	+= s6000/

obj-$(CONFIG_SND_SOC)	+= sh/

obj-$(CONFIG_SND_SOC)	+= sirf/

obj-$(CONFIG_SND_SOC)	+= spear/

sound/soc/codecs/adau1761.c

+4 −0
Original line number Diff line number Diff line
@@ -405,6 +405,7 @@ static const struct snd_soc_dapm_widget adau1761_dapm_widgets[] = { 
		2, 0, NULL, 0),



	SND_SOC_DAPM_SUPPLY("Slew Clock", ADAU1761_CLK_ENABLE0, 6, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY("ALC Clock", ADAU1761_CLK_ENABLE0, 5, 0, NULL, 0),



	SND_SOC_DAPM_SUPPLY_S("Digital Clock 0", 1, ADAU1761_CLK_ENABLE1,

		0, 0, NULL, 0),
@@ -436,6 +437,9 @@ static const struct snd_soc_dapm_route adau1761_dapm_routes[] = { 
	{ "Right Playback Mixer", NULL, "Slew Clock" },

	{ "Left Playback Mixer", NULL, "Slew Clock" },



	{ "Left Input Mixer", NULL, "ALC Clock" },

	{ "Right Input Mixer", NULL, "ALC Clock" },



	{ "Digital Clock 0", NULL, "SYSCLK" },

	{ "Digital Clock 1", NULL, "SYSCLK" },

};

sound/soc/fsl/fsl_asrc.c

+1 −1
Original line number Diff line number Diff line
@@ -792,7 +792,7 @@ static int fsl_asrc_probe(struct platform_device *pdev) 
		return -ENOMEM;



	asrc_priv->pdev = pdev;

	strcpy(asrc_priv->name, np->name);

	strncpy(asrc_priv->name, np->name, sizeof(asrc_priv->name) - 1);



	/* Get the addresses and IRQ */

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);