Commit 7b7b3849 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/tegra', 'asoc/topic/tlv320aic23',... 

Merge remote-tracking branches 'asoc/topic/tegra', 'asoc/topic/tlv320aic23', 'asoc/topic/topology', 'asoc/topic/twl6040' and 'asoc/topic/txx9' into asoc-next
parents 65fd5252 bf3c6ef7 a03faba9 d7766aa5 0636e8b3 84052652

sound/soc/codecs/tlv320aic23.c

+3 −4
Original line number Diff line number Diff line
@@ -174,10 +174,9 @@ static const struct snd_soc_dapm_route tlv320aic23_intercon[] = { 
	{"ROUT", NULL, "Output Mixer"},



	/* Inputs */

	{"Line Input", "NULL", "LLINEIN"},

	{"Line Input", "NULL", "RLINEIN"},



	{"Mic Input", "NULL", "MICIN"},

	{"Line Input", NULL, "LLINEIN"},

	{"Line Input", NULL, "RLINEIN"},

	{"Mic Input", NULL, "MICIN"},



	/* input mux */

	{"Capture Source", "Line", "Line Input"},

sound/soc/codecs/twl6040.c

+8 −0
Original line number Diff line number Diff line
@@ -606,6 +606,14 @@ static const struct snd_kcontrol_new twl6040_snd_controls[] = { 
		twl6040_headset_power_get_enum,

		twl6040_headset_power_put_enum),



	/* Left HS PDM data routed to Right HSDAC */

	SOC_SINGLE("Headset Mono to Stereo Playback Switch",

		TWL6040_REG_HSRCTL, 7, 1, 0),



	/* Left HF PDM data routed to Right HFDAC */

	SOC_SINGLE("Handsfree Mono to Stereo Playback Switch",

		TWL6040_REG_HFRCTL, 5, 1, 0),



	SOC_ENUM_EXT("PLL Selection", twl6040_power_mode_enum,

		twl6040_pll_get_enum, twl6040_pll_put_enum),

};

sound/soc/soc-topology.c

+3 −2
Original line number Diff line number Diff line
@@ -495,12 +495,13 @@ static void remove_widget(struct snd_soc_component *comp, 
			struct snd_kcontrol *kcontrol = w->kcontrols[i];

			struct soc_enum *se =

				(struct soc_enum *)kcontrol->private_value;

			int j;



			snd_ctl_remove(card, kcontrol);



			kfree(se->dobj.control.dvalues);

			for (i = 0; i < se->items; i++)

				kfree(se->dobj.control.dtexts[i]);

			for (j = 0; j < se->items; j++)

				kfree(se->dobj.control.dtexts[j]);



			kfree(se);

		}

sound/soc/tegra/tegra20_ac97.c

+0 −1
Original line number Diff line number Diff line
@@ -318,7 +318,6 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev) 
	ac97 = devm_kzalloc(&pdev->dev, sizeof(struct tegra20_ac97),

			    GFP_KERNEL);

	if (!ac97) {

		dev_err(&pdev->dev, "Can't allocate tegra20_ac97\n");

		ret = -ENOMEM;

		goto err;

	}

sound/soc/tegra/tegra20_das.c

+1 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ static inline void tegra20_das_write(u32 reg, u32 val) 
static inline u32 tegra20_das_read(u32 reg)

{

	u32 val;



	regmap_read(das->regmap, reg, &val);

	return val;

}
@@ -142,7 +143,6 @@ static int tegra20_das_probe(struct platform_device *pdev) 


	das = devm_kzalloc(&pdev->dev, sizeof(struct tegra20_das), GFP_KERNEL);

	if (!das) {

		dev_err(&pdev->dev, "Can't allocate tegra20_das\n");

		ret = -ENOMEM;

		goto err;

	}