Merge branch 'for-linus' into for-next (3cdca6d6) · Commits · 戴 / test

sound/hda/hdac_regmap.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -363,7 +363,6 @@ static const struct regmap_config hda_regmap_cfg = {
		.reg_write = hda_reg_write,
		.use_single_read = true,
		.use_single_write = true,
		.disable_locking = true,
		};

		/**

+8 −5

Original line number	Diff line number	Diff line
		@@ -125,7 +125,7 @@ static char *patch[SNDRV_CARDS];
		static bool beep_mode[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] =
		CONFIG_SND_HDA_INPUT_BEEP_MODE};
		#endif
		static bool dsp_driver = 1;
		static bool dmic_detect = 1;

		module_param_array(index, int, NULL, 0444);
		MODULE_PARM_DESC(index, "Index value for Intel HD audio interface.");
		@@ -160,9 +160,10 @@ module_param_array(beep_mode, bool, NULL, 0444);
		MODULE_PARM_DESC(beep_mode, "Select HDA Beep registration mode "
		"(0=off, 1=on) (default=1).");
		#endif
		module_param(dsp_driver, bool, 0444);
		MODULE_PARM_DESC(dsp_driver, "Allow DSP driver selection (bypass this driver) "
		"(0=off, 1=on) (default=1)");
		module_param(dmic_detect, bool, 0444);
		MODULE_PARM_DESC(dmic_detect, "Allow DSP driver selection (bypass this driver) "
		"(0=off, 1=on) (default=1); "
		"deprecated, use snd-intel-dspcfg.dsp_driver option instead");

		#ifdef CONFIG_PM
		static int param_set_xint(const char val, const struct kernel_param kp);
		@@ -2101,11 +2102,13 @@ static int azx_probe(struct pci_dev *pci,
		/*
		* stop probe if another Intel's DSP driver should be activated
		*/
		if (dsp_driver) {
		if (dmic_detect) {
		err = snd_intel_dsp_driver_probe(pci);
		if (err != SND_INTEL_DSP_DRIVER_ANY &&
		err != SND_INTEL_DSP_DRIVER_LEGACY)
		return -ENODEV;
		} else {
		dev_warn(&pci->dev, "dmic_detect option is deprecated, pass snd-intel-dspcfg.dsp_driver=1 option instead\n");
		}

		err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,

+2 −0

Original line number	Diff line number	Diff line
		@@ -412,6 +412,7 @@ static void alc_fill_eapd_coef(struct hda_codec *codec)
		case 0x10ec0672:
		alc_update_coef_idx(codec, 0xd, 0, 1<<14); /* EAPD Ctrl */
		break;
		case 0x10ec0222:
		case 0x10ec0623:
		alc_update_coef_idx(codec, 0x19, 1<<13, 0);
		break;
		@@ -7267,6 +7268,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
		SND_PCI_QUIRK(0x17aa, 0x224c, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),
		SND_PCI_QUIRK(0x17aa, 0x224d, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),
		SND_PCI_QUIRK(0x17aa, 0x225d, "Thinkpad T480", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
		SND_PCI_QUIRK(0x17aa, 0x2292, "Thinkpad X1 Yoga 7th", ALC285_FIXUP_SPEAKER2_TO_DAC1),
		SND_PCI_QUIRK(0x17aa, 0x2293, "Thinkpad X1 Carbon 7th", ALC285_FIXUP_SPEAKER2_TO_DAC1),
		SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
		SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),

+8 −1

Original line number	Diff line number	Diff line
		@@ -505,15 +505,20 @@ static int fsl_audmix_probe(struct platform_device *pdev)
		ARRAY_SIZE(fsl_audmix_dai));
		if (ret) {
		dev_err(dev, "failed to register ASoC DAI\n");
		return ret;
		goto err_disable_pm;
		}

		priv->pdev = platform_device_register_data(dev, mdrv, 0, NULL, 0);
		if (IS_ERR(priv->pdev)) {
		ret = PTR_ERR(priv->pdev);
		dev_err(dev, "failed to register platform %s: %d\n", mdrv, ret);
		goto err_disable_pm;
		}

		return 0;

		err_disable_pm:
		pm_runtime_disable(dev);
		return ret;
		}

		@@ -521,6 +526,8 @@ static int fsl_audmix_remove(struct platform_device *pdev)
		{
		struct fsl_audmix *priv = dev_get_drvdata(&pdev->dev);

		pm_runtime_disable(&pdev->dev);

		if (priv->pdev)
		platform_device_unregister(priv->pdev);

+0 −1