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

Commit f36c4045 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote branch 'takashi/topic/asoc' into for-2.6.33

parents aa983d9d 140318aa

sound/soc/codecs/wm8711.c

+4 −3
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/pm.h>

#include <linux/i2c.h>

#include <linux/platform_device.h>

#include <linux/spi/spi.h>

#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>
@@ -632,9 +633,9 @@ static int __init wm8711_modinit(void) 
	}

#endif

#if defined(CONFIG_SPI_MASTER)

	ret = spi_register_driver(&wm8731_spi_driver);

	ret = spi_register_driver(&wm8711_spi_driver);

	if (ret != 0) {

		printk(KERN_ERR "Failed to register WM8731 SPI driver: %d\n",

		printk(KERN_ERR "Failed to register WM8711 SPI driver: %d\n",

		       ret);

	}

#endif
@@ -648,7 +649,7 @@ static void __exit wm8711_exit(void) 
	i2c_del_driver(&wm8711_i2c_driver);

#endif

#if defined(CONFIG_SPI_MASTER)

	spi_unregister_driver(&wm8731_spi_driver);

	spi_unregister_driver(&wm8711_spi_driver);

#endif

}

module_exit(wm8711_exit);

sound/soc/s3c24xx/neo1973_gta02_wm8753.c

+3 −3
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static int neo1973_gta02_hifi_hw_free(struct snd_pcm_substream *substream) 
	struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;



	/* disable the PLL */

	return snd_soc_dai_set_pll(codec_dai, WM8753_PLL1, 0, 0);

	return snd_soc_dai_set_pll(codec_dai, WM8753_PLL1, 0, 0, 0);

}



/*
@@ -183,7 +183,7 @@ static int neo1973_gta02_voice_hw_params( 
		return ret;



	/* configue and enable PLL for 12.288MHz output */

	ret = snd_soc_dai_set_pll(codec_dai, WM8753_PLL2,

	ret = snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, 0,

		iis_clkrate / 4, 12288000);

	if (ret < 0)

		return ret;
@@ -197,7 +197,7 @@ static int neo1973_gta02_voice_hw_free(struct snd_pcm_substream *substream) 
	struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;



	/* disable the PLL */

	return snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, 0, 0);

	return snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, 0, 0, 0);

}



static struct snd_soc_ops neo1973_gta02_voice_ops = {

sound/soc/s3c24xx/neo1973_wm8753.c

+3 −3
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static int neo1973_hifi_hw_free(struct snd_pcm_substream *substream) 
	pr_debug("Entered %s\n", __func__);



	/* disable the PLL */

	return snd_soc_dai_set_pll(codec_dai, WM8753_PLL1, 0, 0);

	return snd_soc_dai_set_pll(codec_dai, WM8753_PLL1, 0, 0, 0);

}



/*
@@ -203,7 +203,7 @@ static int neo1973_voice_hw_params(struct snd_pcm_substream *substream, 
		return ret;



	/* configue and enable PLL for 12.288MHz output */

	ret = snd_soc_dai_set_pll(codec_dai, WM8753_PLL2,

	ret = snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, 0,

		iis_clkrate / 4, 12288000);

	if (ret < 0)

		return ret;
@@ -219,7 +219,7 @@ static int neo1973_voice_hw_free(struct snd_pcm_substream *substream) 
	pr_debug("Entered %s\n", __func__);



	/* disable the PLL */

	return snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, 0, 0);

	return snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, 0, 0, 0);

}



static struct snd_soc_ops neo1973_voice_ops = {