Merge branch 'for-3.0' of... (05d3962c) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/atmel/atmel_ssc_dai.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -848,9 +848,10 @@ int atmel_ssc_set_audio(int ssc_id)
	if (IS_ERR(ssc))		if (IS_ERR(ssc))
	pr_warn("Unable to parent ASoC SSC DAI on SSC: %ld\n",		pr_warn("Unable to parent ASoC SSC DAI on SSC: %ld\n",
	PTR_ERR(ssc));		PTR_ERR(ssc));
	else		else {
	ssc_pdev->dev.parent = &(ssc->pdev->dev);		ssc_pdev->dev.parent = &(ssc->pdev->dev);
	ssc_free(ssc);		ssc_free(ssc);
			}

	ret = platform_device_add(ssc_pdev);		ret = platform_device_add(ssc_pdev);
	if (ret < 0)		if (ret < 0)

sound/soc/codecs/wm_hubs.c

+4 −4

sound/soc/soc-dapm.c

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -325,6 +325,7 @@ static int dapm_connect_mixer(struct snd_soc_dapm_context *dapm,
	}		}

	static int dapm_is_shared_kcontrol(struct snd_soc_dapm_context *dapm,		static int dapm_is_shared_kcontrol(struct snd_soc_dapm_context *dapm,
			struct snd_soc_dapm_widget *kcontrolw,
	const struct snd_kcontrol_new *kcontrol_new,		const struct snd_kcontrol_new *kcontrol_new,
	struct snd_kcontrol **kcontrol)		struct snd_kcontrol **kcontrol)
	{		{
	@@ -334,6 +335,8 @@ static int dapm_is_shared_kcontrol(struct snd_soc_dapm_context *dapm,
	*kcontrol = NULL;		*kcontrol = NULL;

	list_for_each_entry(w, &dapm->card->widgets, list) {		list_for_each_entry(w, &dapm->card->widgets, list) {
			if (w == kcontrolw \|\| w->dapm != kcontrolw->dapm)
			continue;
	for (i = 0; i < w->num_kcontrols; i++) {		for (i = 0; i < w->num_kcontrols; i++) {
	if (&w->kcontrol_news[i] == kcontrol_new) {		if (&w->kcontrol_news[i] == kcontrol_new) {
	if (w->kcontrols)		if (w->kcontrols)
	@@ -468,7 +471,7 @@ static int dapm_new_mux(struct snd_soc_dapm_context *dapm,
	return -EINVAL;		return -EINVAL;
	}		}

	shared = dapm_is_shared_kcontrol(dapm, &w->kcontrol_news[0],		shared = dapm_is_shared_kcontrol(dapm, w, &w->kcontrol_news[0],
	&kcontrol);		&kcontrol);
	if (kcontrol) {		if (kcontrol) {
	wlist = kcontrol->private_data;		wlist = kcontrol->private_data;

Original line number	Original line	Diff line number	Diff line
	@@ -215,23 +215,23 @@ static const struct snd_kcontrol_new analogue_snd_controls[] = {
	SOC_SINGLE_TLV("IN1L Volume", WM8993_LEFT_LINE_INPUT_1_2_VOLUME, 0, 31, 0,		SOC_SINGLE_TLV("IN1L Volume", WM8993_LEFT_LINE_INPUT_1_2_VOLUME, 0, 31, 0,
	inpga_tlv),		inpga_tlv),
	SOC_SINGLE("IN1L Switch", WM8993_LEFT_LINE_INPUT_1_2_VOLUME, 7, 1, 1),		SOC_SINGLE("IN1L Switch", WM8993_LEFT_LINE_INPUT_1_2_VOLUME, 7, 1, 1),
	SOC_SINGLE("IN1L ZC Switch", WM8993_LEFT_LINE_INPUT_1_2_VOLUME, 7, 1, 0),		SOC_SINGLE("IN1L ZC Switch", WM8993_LEFT_LINE_INPUT_1_2_VOLUME, 6, 1, 0),

	SOC_SINGLE_TLV("IN1R Volume", WM8993_RIGHT_LINE_INPUT_1_2_VOLUME, 0, 31, 0,		SOC_SINGLE_TLV("IN1R Volume", WM8993_RIGHT_LINE_INPUT_1_2_VOLUME, 0, 31, 0,
	inpga_tlv),		inpga_tlv),
	SOC_SINGLE("IN1R Switch", WM8993_RIGHT_LINE_INPUT_1_2_VOLUME, 7, 1, 1),		SOC_SINGLE("IN1R Switch", WM8993_RIGHT_LINE_INPUT_1_2_VOLUME, 7, 1, 1),
	SOC_SINGLE("IN1R ZC Switch", WM8993_RIGHT_LINE_INPUT_1_2_VOLUME, 7, 1, 0),		SOC_SINGLE("IN1R ZC Switch", WM8993_RIGHT_LINE_INPUT_1_2_VOLUME, 6, 1, 0),


	SOC_SINGLE_TLV("IN2L Volume", WM8993_LEFT_LINE_INPUT_3_4_VOLUME, 0, 31, 0,		SOC_SINGLE_TLV("IN2L Volume", WM8993_LEFT_LINE_INPUT_3_4_VOLUME, 0, 31, 0,
	inpga_tlv),		inpga_tlv),
	SOC_SINGLE("IN2L Switch", WM8993_LEFT_LINE_INPUT_3_4_VOLUME, 7, 1, 1),		SOC_SINGLE("IN2L Switch", WM8993_LEFT_LINE_INPUT_3_4_VOLUME, 7, 1, 1),
	SOC_SINGLE("IN2L ZC Switch", WM8993_LEFT_LINE_INPUT_3_4_VOLUME, 7, 1, 0),		SOC_SINGLE("IN2L ZC Switch", WM8993_LEFT_LINE_INPUT_3_4_VOLUME, 6, 1, 0),

	SOC_SINGLE_TLV("IN2R Volume", WM8993_RIGHT_LINE_INPUT_3_4_VOLUME, 0, 31, 0,		SOC_SINGLE_TLV("IN2R Volume", WM8993_RIGHT_LINE_INPUT_3_4_VOLUME, 0, 31, 0,
	inpga_tlv),		inpga_tlv),
	SOC_SINGLE("IN2R Switch", WM8993_RIGHT_LINE_INPUT_3_4_VOLUME, 7, 1, 1),		SOC_SINGLE("IN2R Switch", WM8993_RIGHT_LINE_INPUT_3_4_VOLUME, 7, 1, 1),
	SOC_SINGLE("IN2R ZC Switch", WM8993_RIGHT_LINE_INPUT_3_4_VOLUME, 7, 1, 0),		SOC_SINGLE("IN2R ZC Switch", WM8993_RIGHT_LINE_INPUT_3_4_VOLUME, 6, 1, 0),

	SOC_SINGLE_TLV("MIXINL IN2L Volume", WM8993_INPUT_MIXER3, 7, 1, 0,		SOC_SINGLE_TLV("MIXINL IN2L Volume", WM8993_INPUT_MIXER3, 7, 1, 0,
	inmix_sw_tlv),		inmix_sw_tlv),