diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-05 15:25:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-05 15:25:41 +0100 |
| commit | aac521e880f221e6d4e67b7061022dbecace0df0 (patch) | |
| tree | fca79e92df04b0b433d2c665dc5baf56e603ac25 | |
| parent | ff2faf1289c1f81b5b26b9451dd1c2006aac8db8 (diff) | |
| parent | c90ddb69d4b24bc32edf9c7bcfec85e52427d1c1 (diff) | |
Merge branch 'asoc-4.17' into asoc-4.18 merge window
| -rw-r--r-- | MAINTAINERS | 9 | ||||
| -rw-r--r-- | sound/soc/codecs/cs35l35.c | 1 | ||||
| -rw-r--r-- | sound/soc/intel/boards/bytcr_rt5651.c | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index eaee45919cb9..1eed0f5edd86 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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> diff --git a/sound/soc/codecs/cs35l35.c b/sound/soc/codecs/cs35l35.c index a4a2cb171bdf..bd6226bde45f 100644 --- a/sound/soc/codecs/cs35l35.c +++ b/sound/soc/codecs/cs35l35.c @@ -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) diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index 1be788e04193..987720e203f9 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -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 |