Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 844ec314 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/asoc' into for-linus

parents 645e9035 497d4965

sound/soc/codecs/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_CX20442

	select SND_SOC_DA7210 if I2C

	select SND_SOC_DFBMCS320

	select SND_SOC_JZ4740_CODEC if SOC_JZ4740

	select SND_SOC_JZ4740_CODEC

	select SND_SOC_LM4857 if I2C

	select SND_SOC_MAX98088 if I2C

	select SND_SOC_MAX98095 if I2C

sound/soc/codecs/jz4740.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/io.h>



#include <linux/delay.h>

sound/soc/codecs/wm8958-dsp2.c

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ static int wm8958_dsp2_fw(struct snd_soc_codec *codec, const char *name, 
	}



	if (memcmp(fw->data, "WMFW", 4) != 0) {

		memcpy(&data32, fw->data, sizeof(data32));

		data32 = be32_to_cpu(data32);

		dev_err(codec->dev, "%s: firmware has bad file magic %08x\n",

			name, data32);

		goto err;

sound/soc/codecs/wm8996.c

+1 −0
Original line number Diff line number Diff line
@@ -1968,6 +1968,7 @@ static int wm8996_set_sysclk(struct snd_soc_dai *dai, 
		break;

	case 24576000:

		ratediv = WM8996_SYSCLK_DIV;

		wm8996->sysclk /= 2;

	case 12288000:

		snd_soc_update_bits(codec, WM8996_AIF_RATE,

				    WM8996_SYSCLK_RATE, WM8996_SYSCLK_RATE);

sound/soc/mxs/mxs-pcm.c

+3 −0
Original line number Diff line number Diff line
@@ -357,3 +357,6 @@ static void __exit snd_mxs_pcm_exit(void) 
	platform_driver_unregister(&mxs_pcm_driver);

}

module_exit(snd_mxs_pcm_exit);



MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:mxs-pcm-audio");