Merge branch 'fix/hda' into topic/hda (67c6dc4d) · Commits · e / devices / android_kernel_xiaomi_markw

include/linux/mfd/wm8994/pdata.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ struct wm8994_ldo_pdata {
		#define WM8994_CONFIGURE_GPIO 0x8000

		#define WM8994_DRC_REGS 5
		#define WM8994_EQ_REGS 19
		#define WM8994_EQ_REGS 20

		/**
		* DRC configurations are specified with a label and a set of register

sound/pci/hda/patch_conexant.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -3097,8 +3097,7 @@ static const char *cxt5066_models[CXT5066_MODELS] = {
		static struct snd_pci_quirk cxt5066_cfg_tbl[] = {
		SND_PCI_QUIRK_MASK(0x1025, 0xff00, 0x0400, "Acer", CXT5066_IDEAPAD),
		SND_PCI_QUIRK(0x1028, 0x02d8, "Dell Vostro", CXT5066_DELL_VOSTRO),
		SND_PCI_QUIRK(0x1028, 0x02f5, "Dell",
		CXT5066_DELL_LAPTOP),
		SND_PCI_QUIRK(0x1028, 0x02f5, "Dell Vostro 320", CXT5066_IDEAPAD),
		SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTRO),
		SND_PCI_QUIRK(0x1028, 0x0408, "Dell Inspiron One 19T", CXT5066_IDEAPAD),
		SND_PCI_QUIRK(0x103c, 0x360b, "HP G60", CXT5066_HP_LAPTOP),

sound/pci/hda/patch_realtek.c

+23 −2

Original line number	Diff line number	Diff line
		@@ -10819,7 +10819,8 @@ static int alc_auto_add_mic_boost(struct hda_codec *codec)
		{
		struct alc_spec *spec = codec->spec;
		struct auto_pin_cfg *cfg = &spec->autocfg;
		int i, err;
		int i, err, type;
		int type_idx = 0;
		hda_nid_t nid;

		for (i = 0; i < cfg->num_inputs; i++) {
		@@ -10828,9 +10829,15 @@ static int alc_auto_add_mic_boost(struct hda_codec *codec)
		nid = cfg->inputs[i].pin;
		if (get_wcaps(codec, nid) & AC_WCAP_IN_AMP) {
		char label[32];
		type = cfg->inputs[i].type;
		if (i > 0 && type == cfg->inputs[i - 1].type)
		type_idx++;
		else
		type_idx = 0;
		snprintf(label, sizeof(label), "%s Boost",
		hda_get_autocfg_input_label(codec, cfg, i));
		err = add_control(spec, ALC_CTL_WIDGET_VOL, label, 0,
		err = add_control(spec, ALC_CTL_WIDGET_VOL, label,
		type_idx,
		HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_INPUT));
		if (err < 0)
		return err;
		@@ -14789,6 +14796,8 @@ static int alc269_resume(struct hda_codec *codec)
		enum {
		ALC269_FIXUP_SONY_VAIO,
		ALC269_FIXUP_DELL_M101Z,
		ALC269_FIXUP_SKU_IGNORE,
		ALC269_FIXUP_ASUS_G73JW,
		};

		static const struct alc_fixup alc269_fixups[] = {
		@@ -14806,11 +14815,23 @@ static const struct alc_fixup alc269_fixups[] = {
		{}
		}
		},
		[ALC269_FIXUP_SKU_IGNORE] = {
		.sku = ALC_FIXUP_SKU_IGNORE,
		},
		[ALC269_FIXUP_ASUS_G73JW] = {
		.pins = (const struct alc_pincfg[]) {
		{ 0x17, 0x99130111 }, /* subwoofer */
		{ }
		}
		},
		};

		static struct snd_pci_quirk alc269_fixup_tbl[] = {
		SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),
		SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),
		SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE),
		SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE),
		SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW),
		{}
		};

sound/soc/atmel/sam9g20_wm8731.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -222,9 +222,9 @@ static int __init at91sam9g20ek_init(void)
		}

		pllb = clk_get(NULL, "pllb");
		if (IS_ERR(mclk)) {
		if (IS_ERR(pllb)) {
		printk(KERN_ERR "ASoC: Failed to get PLLB\n");
		ret = PTR_ERR(mclk);
		ret = PTR_ERR(pllb);
		goto err_mclk;
		}
		ret = clk_set_parent(mclk, pllb);
		@@ -240,6 +240,7 @@ static int __init at91sam9g20ek_init(void)
		if (!at91sam9g20ek_snd_device) {
		printk(KERN_ERR "ASoC: Platform device allocation failed\n");
		ret = -ENOMEM;
		goto err_mclk;
		}

		platform_set_drvdata(at91sam9g20ek_snd_device,
		@@ -248,11 +249,13 @@ static int __init at91sam9g20ek_init(void)
		ret = platform_device_add(at91sam9g20ek_snd_device);
		if (ret) {
		printk(KERN_ERR "ASoC: Platform device allocation failed\n");
		platform_device_put(at91sam9g20ek_snd_device);
		goto err_device_add;
		}

		return ret;

		err_device_add:
		platform_device_put(at91sam9g20ek_snd_device);
		err_mclk:
		clk_put(mclk);
		mclk = NULL;

sound/soc/atmel/snd-soc-afeb9260.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -167,7 +167,6 @@ static int __init afeb9260_soc_init(void)

		return 0;
		err1:
		platform_device_del(afeb9260_snd_device);
		platform_device_put(afeb9260_snd_device);
		return err;
		}