Merge branch 'asoc-4.17' into asoc-4.18 merge window (aac521e8) · Commits · e / devices / android_kernel_xiaomi_nabu

MAINTAINERS

+4 −5

Original line number	Diff line number	Diff line
		@@ -7023,14 +7023,13 @@ L: linux-fbdev@vger.kernel.org
		S: Maintained
		F: drivers/video/fbdev/i810/

		INTEL ASoC BDW/HSW DRIVERS
		INTEL ASoC DRIVERS
		M: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
		M: Liam Girdwood <liam.r.girdwood@linux.intel.com>
		M: Jie Yang <yang.jie@linux.intel.com>
		L: alsa-devel@alsa-project.org (moderated for non-subscribers)
		S: Supported
		F: sound/soc/intel/common/sst-dsp*
		F: sound/soc/intel/common/sst-firmware.c
		F: sound/soc/intel/boards/broadwell.c
		F: sound/soc/intel/haswell/
		F: sound/soc/intel/

		INTEL C600 SERIES SAS CONTROLLER DRIVER
		M: Intel SCU Linux support <intel-linux-scu@intel.com>

+1 −0

Original line number	Diff line number	Diff line
		@@ -1105,6 +1105,7 @@ static struct regmap_config cs35l35_regmap = {
		.readable_reg = cs35l35_readable_register,
		.precious_reg = cs35l35_precious_register,
		.cache_type = REGCACHE_RBTREE,
		.use_single_rw = true,
		};

		static irqreturn_t cs35l35_irq(int irq, void *data)

+3 −2

Original line number	Diff line number	Diff line
		@@ -861,9 +861,10 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
		if (byt_rt5651_quirk & BYT_RT5651_MCLK_EN) {
		priv->mclk = devm_clk_get(&pdev->dev, "pmc_plt_clk_3");
		if (IS_ERR(priv->mclk)) {
		ret_val = PTR_ERR(priv->mclk);
		dev_err(&pdev->dev,
		"Failed to get MCLK from pmc_plt_clk_3: %ld\n",
		PTR_ERR(priv->mclk));
		"Failed to get MCLK from pmc_plt_clk_3: %d\n",
		ret_val);
		/*
		* Fall back to bit clock usage for -ENOENT (clock not
		* available likely due to missing dependencies), bail