Merge branch 'for-3.3' of... (29abceb6) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/mfd/wm8994-core.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -268,6 +268,7 @@ static int wm8994_suspend(struct device *dev)
		wm8994_reg_write(wm8994, WM8994_SOFTWARE_RESET,
		wm8994_reg_read(wm8994, WM8994_SOFTWARE_RESET));

		regcache_cache_only(wm8994->regmap, true);
		regcache_mark_dirty(wm8994->regmap);

		wm8994->suspended = true;
		@@ -298,6 +299,7 @@ static int wm8994_resume(struct device *dev)
		return ret;
		}

		regcache_cache_only(wm8994->regmap, false);
		ret = regcache_sync(wm8994->regmap);
		if (ret != 0) {
		dev_err(dev, "Failed to restore register map: %d\n", ret);

+3 −3

Original line number	Diff line number	Diff line
		@@ -847,7 +847,7 @@ struct snd_soc_card {

		/* SoC machine DAI configuration, glues a codec and cpu DAI together */
		struct snd_soc_pcm_runtime {
		struct device dev;
		struct device *dev;
		struct snd_soc_card *card;
		struct snd_soc_dai_link *dai_link;
		struct mutex pcm_mutex;
		@@ -933,12 +933,12 @@ static inline void snd_soc_platform_get_drvdata(struct snd_soc_platform platfo
		static inline void snd_soc_pcm_set_drvdata(struct snd_soc_pcm_runtime *rtd,
		void *data)
		{
		dev_set_drvdata(&rtd->dev, data);
		dev_set_drvdata(rtd->dev, data);
		}

		static inline void snd_soc_pcm_get_drvdata(struct snd_soc_pcm_runtime rtd)
		{
		return dev_get_drvdata(&rtd->dev);
		return dev_get_drvdata(rtd->dev);
		}

		static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card)

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ config SND_AT91_SOC_SAM9G20_WM8731

		config SND_AT91_SOC_AFEB9260
		tristate "SoC Audio support for AFEB9260 board"
		depends on ARCH_AT91 && MACH_AFEB9260 && SND_ATMEL_SOC
		depends on ATMEL_SSC && ARCH_AT91 && MACH_AFEB9260 && SND_ATMEL_SOC
		select SND_ATMEL_SOC_SSC
		select SND_SOC_TLV320AIC23
		help

+2 −3

Original line number	Diff line number	Diff line
		@@ -367,7 +367,6 @@ static u64 atmel_pcm_dmamask = 0xffffffff;
		static int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd)
		{
		struct snd_card *card = rtd->card->snd_card;
		struct snd_soc_dai *dai = rtd->cpu_dai;
		struct snd_pcm *pcm = rtd->pcm;
		int ret = 0;

		@@ -376,14 +375,14 @@ static int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd)
		if (!card->dev->coherent_dma_mask)
		card->dev->coherent_dma_mask = 0xffffffff;

		if (dai->driver->playback.channels_min) {
		if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
		ret = atmel_pcm_preallocate_dma_buffer(pcm,
		SNDRV_PCM_STREAM_PLAYBACK);
		if (ret)
		goto out;
		}

		if (dai->driver->capture.channels_min) {
		if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
		pr_debug("atmel-pcm:"
		"Allocating PCM capture DMA buffer\n");
		ret = atmel_pcm_preallocate_dma_buffer(pcm,

+2 −3

Original line number	Diff line number	Diff line
		@@ -421,7 +421,6 @@ static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32);
		static int bf5xx_pcm_ac97_new(struct snd_soc_pcm_runtime *rtd)
		{
		struct snd_card *card = rtd->card->snd_card;
		struct snd_soc_dai *dai = rtd->cpu_dai;
		struct snd_pcm *pcm = rtd->pcm;
		int ret = 0;

		@@ -431,14 +430,14 @@ static int bf5xx_pcm_ac97_new(struct snd_soc_pcm_runtime *rtd)
		if (!card->dev->coherent_dma_mask)
		card->dev->coherent_dma_mask = DMA_BIT_MASK(32);

		if (dai->driver->playback.channels_min) {
		if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
		ret = bf5xx_pcm_preallocate_dma_buffer(pcm,
		SNDRV_PCM_STREAM_PLAYBACK);
		if (ret)
		goto out;
		}

		if (dai->driver->capture.channels_min) {
		if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
		ret = bf5xx_pcm_preallocate_dma_buffer(pcm,
		SNDRV_PCM_STREAM_CAPTURE);
		if (ret)