Merge branch 'fix/asoc' into for-linus
This commit is contained in:
commit
844ec3142a
9 changed files with 14 additions and 5 deletions
|
@ -33,7 +33,7 @@ config SND_SOC_ALL_CODECS
|
||||||
select SND_SOC_CX20442
|
select SND_SOC_CX20442
|
||||||
select SND_SOC_DA7210 if I2C
|
select SND_SOC_DA7210 if I2C
|
||||||
select SND_SOC_DFBMCS320
|
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_LM4857 if I2C
|
||||||
select SND_SOC_MAX98088 if I2C
|
select SND_SOC_MAX98088 if I2C
|
||||||
select SND_SOC_MAX98095 if I2C
|
select SND_SOC_MAX98095 if I2C
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
|
#include <linux/io.h>
|
||||||
|
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
|
|
||||||
|
|
|
@ -60,6 +60,8 @@ static int wm8958_dsp2_fw(struct snd_soc_codec *codec, const char *name,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (memcmp(fw->data, "WMFW", 4) != 0) {
|
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",
|
dev_err(codec->dev, "%s: firmware has bad file magic %08x\n",
|
||||||
name, data32);
|
name, data32);
|
||||||
goto err;
|
goto err;
|
||||||
|
|
|
@ -1968,6 +1968,7 @@ static int wm8996_set_sysclk(struct snd_soc_dai *dai,
|
||||||
break;
|
break;
|
||||||
case 24576000:
|
case 24576000:
|
||||||
ratediv = WM8996_SYSCLK_DIV;
|
ratediv = WM8996_SYSCLK_DIV;
|
||||||
|
wm8996->sysclk /= 2;
|
||||||
case 12288000:
|
case 12288000:
|
||||||
snd_soc_update_bits(codec, WM8996_AIF_RATE,
|
snd_soc_update_bits(codec, WM8996_AIF_RATE,
|
||||||
WM8996_SYSCLK_RATE, WM8996_SYSCLK_RATE);
|
WM8996_SYSCLK_RATE, WM8996_SYSCLK_RATE);
|
||||||
|
|
|
@ -357,3 +357,6 @@ static void __exit snd_mxs_pcm_exit(void)
|
||||||
platform_driver_unregister(&mxs_pcm_driver);
|
platform_driver_unregister(&mxs_pcm_driver);
|
||||||
}
|
}
|
||||||
module_exit(snd_mxs_pcm_exit);
|
module_exit(snd_mxs_pcm_exit);
|
||||||
|
|
||||||
|
MODULE_LICENSE("GPL");
|
||||||
|
MODULE_ALIAS("platform:mxs-pcm-audio");
|
||||||
|
|
|
@ -171,3 +171,4 @@ module_exit(mxs_sgtl5000_exit);
|
||||||
MODULE_AUTHOR("Freescale Semiconductor, Inc.");
|
MODULE_AUTHOR("Freescale Semiconductor, Inc.");
|
||||||
MODULE_DESCRIPTION("MXS ALSA SoC Machine driver");
|
MODULE_DESCRIPTION("MXS ALSA SoC Machine driver");
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
|
MODULE_ALIAS("platform:mxs-sgtl5000");
|
||||||
|
|
|
@ -209,9 +209,10 @@ static int __devinit hx4700_audio_probe(struct platform_device *pdev)
|
||||||
snd_soc_card_hx4700.dev = &pdev->dev;
|
snd_soc_card_hx4700.dev = &pdev->dev;
|
||||||
ret = snd_soc_register_card(&snd_soc_card_hx4700);
|
ret = snd_soc_register_card(&snd_soc_card_hx4700);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
gpio_free_array(hx4700_audio_gpios,
|
||||||
|
ARRAY_SIZE(hx4700_audio_gpios));
|
||||||
|
|
||||||
return 0;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __devexit hx4700_audio_remove(struct platform_device *pdev)
|
static int __devexit hx4700_audio_remove(struct platform_device *pdev)
|
||||||
|
|
|
@ -101,7 +101,6 @@ static int jive_wm8750_init(struct snd_soc_pcm_runtime *rtd)
|
||||||
{
|
{
|
||||||
struct snd_soc_codec *codec = rtd->codec;
|
struct snd_soc_codec *codec = rtd->codec;
|
||||||
struct snd_soc_dapm_context *dapm = &codec->dapm;
|
struct snd_soc_dapm_context *dapm = &codec->dapm;
|
||||||
int err;
|
|
||||||
|
|
||||||
/* These endpoints are not being used. */
|
/* These endpoints are not being used. */
|
||||||
snd_soc_dapm_nc_pin(dapm, "LINPUT2");
|
snd_soc_dapm_nc_pin(dapm, "LINPUT2");
|
||||||
|
@ -131,7 +130,7 @@ static struct snd_soc_card snd_soc_machine_jive = {
|
||||||
.dai_link = &jive_dai,
|
.dai_link = &jive_dai,
|
||||||
.num_links = 1,
|
.num_links = 1,
|
||||||
|
|
||||||
.dapm_widgtets = wm8750_dapm_widgets,
|
.dapm_widgets = wm8750_dapm_widgets,
|
||||||
.num_dapm_widgets = ARRAY_SIZE(wm8750_dapm_widgets),
|
.num_dapm_widgets = ARRAY_SIZE(wm8750_dapm_widgets),
|
||||||
.dapm_routes = audio_map,
|
.dapm_routes = audio_map,
|
||||||
.num_dapm_routes = ARRAY_SIZE(audio_map),
|
.num_dapm_routes = ARRAY_SIZE(audio_map),
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <linux/module.h>
|
||||||
#include <sound/soc.h>
|
#include <sound/soc.h>
|
||||||
|
|
||||||
static struct snd_soc_card smdk2443;
|
static struct snd_soc_card smdk2443;
|
||||||
|
|
Reference in a new issue