Commit 74d01b14 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/cs4270', 'asoc/fix/da7219',... 

Merge remote-tracking branches 'asoc/fix/cs4270', 'asoc/fix/da7219', 'asoc/fix/hdmi-codec', 'asoc/fix/pxa', 'asoc/fix/qcom' and 'asoc/fix/rt298' into asoc-linus
parents 56eba7a1 aa5f9209 d64b5bf5 340327a6 5229f1f4 94201798 f515c383

sound/soc/codecs/cs4270.c

+4 −4
Original line number Diff line number Diff line
@@ -148,11 +148,11 @@ SND_SOC_DAPM_OUTPUT("AOUTR"), 
};



static const struct snd_soc_dapm_route cs4270_dapm_routes[] = {

	{ "Capture", NULL, "AINA" },

	{ "Capture", NULL, "AINB" },

	{ "Capture", NULL, "AINL" },

	{ "Capture", NULL, "AINR" },



	{ "AOUTA", NULL, "Playback" },

	{ "AOUTB", NULL, "Playback" },

	{ "AOUTL", NULL, "Playback" },

	{ "AOUTR", NULL, "Playback" },

};



/**

sound/soc/codecs/da7219.c

+2 −1
Original line number Diff line number Diff line
@@ -880,7 +880,8 @@ static const struct snd_soc_dapm_widget da7219_dapm_widgets[] = { 
			    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),



	/* DAI */

	SND_SOC_DAPM_AIF_OUT("DAIOUT", "Capture", 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_OUT("DAIOUT", "Capture", 0, DA7219_DAI_TDM_CTRL,

			     DA7219_DAI_OE_SHIFT, DA7219_NO_INVERT),

	SND_SOC_DAPM_AIF_IN("DAIIN", "Playback", 0, SND_SOC_NOPM, 0, 0),



	/* Output Muxes */

sound/soc/codecs/hdmi-codec.c

+6 −1
Original line number Diff line number Diff line
@@ -364,7 +364,12 @@ static int hdmi_of_xlate_dai_name(struct snd_soc_component *component, 
				  struct of_phandle_args *args,

				  const char **dai_name)

{

	int id = args->args[0];

	int id;



	if (args->args_count)

		id = args->args[0];

	else

		id = 0;



	if (id < ARRAY_SIZE(hdmi_dai_name)) {

		*dai_name = hdmi_dai_name[id];

sound/soc/codecs/rt298.c

+5 −0
Original line number Diff line number Diff line
@@ -249,6 +249,11 @@ static int rt298_jack_detect(struct rt298_priv *rt298, bool *hp, bool *mic) 
			snd_soc_dapm_force_enable_pin(dapm, "LDO1");

			snd_soc_dapm_sync(dapm);



			regmap_update_bits(rt298->regmap,

				RT298_POWER_CTRL1, 0x1001, 0);

			regmap_update_bits(rt298->regmap,

				RT298_POWER_CTRL2, 0x4, 0x4);



			regmap_write(rt298->regmap, RT298_SET_MIC1, 0x24);

			msleep(50);

sound/soc/pxa/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ config SND_PXA2XX_SOC_IMOTE2 


config SND_MMP_SOC_BROWNSTONE

	tristate "SoC Audio support for Marvell Brownstone"

	depends on SND_MMP_SOC && MACH_BROWNSTONE

	depends on SND_MMP_SOC && MACH_BROWNSTONE && I2C

	select SND_MMP_SOC_SSPA

	select MFD_WM8994

	select SND_SOC_WM8994