diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-12 11:00:30 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-12 11:00:30 -0500 |
commit | a429638cac1e5c656818a45aaff78df7b743004e (patch) | |
tree | 0465e0d7a431bff97a3dd5a1f91d9b30c69ae0d8 /sound/soc/mxs | |
parent | 5cf9a4e69c1ff0ccdd1d2b7404f95c0531355274 (diff) | |
parent | 9e4ce164ee3a1d07580f017069c25d180b0aa785 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (526 commits)
ASoC: twl6040 - Add method to query optimum PDM_DL1 gain
ALSA: hda - Fix the lost power-setup of seconary pins after PM resume
ALSA: usb-audio: add Yamaha MOX6/MOX8 support
ALSA: virtuoso: add S/PDIF input support for all Xonars
ALSA: ice1724 - Support for ooAoo SQ210a
ALSA: ice1724 - Allow card info based on model only
ALSA: ice1724 - Create capture pcm only for ADC-enabled configurations
ALSA: hdspm - Provide unique driver id based on card serial
ASoC: Dynamically allocate the rtd device for a non-empty release()
ASoC: Fix recursive dependency due to select ATMEL_SSC in SND_ATMEL_SOC_SSC
ALSA: hda - Fix the detection of "Loopback Mixing" control for VIA codecs
ALSA: hda - Return the error from get_wcaps_type() for invalid NIDs
ALSA: hda - Use auto-parser for HP laptops with cx20459 codec
ALSA: asihpi - Fix potential Oops in snd_asihpi_cmode_info()
ALSA: hdsp - Fix potential Oops in snd_hdsp_info_pref_sync_ref()
ALSA: hda/cirrus - support for iMac12,2 model
ASoC: cx20442: add bias control over a platform provided regulator
ALSA: usb-audio - Avoid flood of frame-active debug messages
ALSA: snd-usb-us122l: Delete calls to preempt_disable
mfd: Put WM8994 into cache only mode when suspending
...
Fix up trivial conflicts in:
- arch/arm/mach-s3c64xx/mach-crag6410.c:
renamed speyside_wm8962 to tobermory, added littlemill right
next to it
- drivers/base/regmap/{regcache.c,regmap.c}:
duplicate diff that had already come in with other changes in
the regmap tree
Diffstat (limited to 'sound/soc/mxs')
-rw-r--r-- | sound/soc/mxs/mxs-pcm.c | 12 | ||||
-rw-r--r-- | sound/soc/mxs/mxs-saif.c | 14 | ||||
-rw-r--r-- | sound/soc/mxs/mxs-sgtl5000.c | 13 |
3 files changed, 5 insertions, 34 deletions
diff --git a/sound/soc/mxs/mxs-pcm.c b/sound/soc/mxs/mxs-pcm.c index f39d7dd9fbcb..0e12f4e0a76d 100644 --- a/sound/soc/mxs/mxs-pcm.c +++ b/sound/soc/mxs/mxs-pcm.c | |||
@@ -346,17 +346,7 @@ static struct platform_driver mxs_pcm_driver = { | |||
346 | .remove = __devexit_p(mxs_soc_platform_remove), | 346 | .remove = __devexit_p(mxs_soc_platform_remove), |
347 | }; | 347 | }; |
348 | 348 | ||
349 | static int __init snd_mxs_pcm_init(void) | 349 | module_platform_driver(mxs_pcm_driver); |
350 | { | ||
351 | return platform_driver_register(&mxs_pcm_driver); | ||
352 | } | ||
353 | module_init(snd_mxs_pcm_init); | ||
354 | |||
355 | static void __exit snd_mxs_pcm_exit(void) | ||
356 | { | ||
357 | platform_driver_unregister(&mxs_pcm_driver); | ||
358 | } | ||
359 | module_exit(snd_mxs_pcm_exit); | ||
360 | 350 | ||
361 | MODULE_LICENSE("GPL"); | 351 | MODULE_LICENSE("GPL"); |
362 | MODULE_ALIAS("platform:mxs-pcm-audio"); | 352 | MODULE_ALIAS("platform:mxs-pcm-audio"); |
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index d775b0761e0a..dccfb37a9626 100644 --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c | |||
@@ -550,7 +550,7 @@ static int mxs_saif_trigger(struct snd_pcm_substream *substream, int cmd, | |||
550 | (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \ | 550 | (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \ |
551 | SNDRV_PCM_FMTBIT_S24_LE) | 551 | SNDRV_PCM_FMTBIT_S24_LE) |
552 | 552 | ||
553 | static struct snd_soc_dai_ops mxs_saif_dai_ops = { | 553 | static const struct snd_soc_dai_ops mxs_saif_dai_ops = { |
554 | .startup = mxs_saif_startup, | 554 | .startup = mxs_saif_startup, |
555 | .trigger = mxs_saif_trigger, | 555 | .trigger = mxs_saif_trigger, |
556 | .prepare = mxs_saif_prepare, | 556 | .prepare = mxs_saif_prepare, |
@@ -779,18 +779,8 @@ static struct platform_driver mxs_saif_driver = { | |||
779 | }, | 779 | }, |
780 | }; | 780 | }; |
781 | 781 | ||
782 | static int __init mxs_saif_init(void) | 782 | module_platform_driver(mxs_saif_driver); |
783 | { | ||
784 | return platform_driver_register(&mxs_saif_driver); | ||
785 | } | ||
786 | |||
787 | static void __exit mxs_saif_exit(void) | ||
788 | { | ||
789 | platform_driver_unregister(&mxs_saif_driver); | ||
790 | } | ||
791 | 783 | ||
792 | module_init(mxs_saif_init); | ||
793 | module_exit(mxs_saif_exit); | ||
794 | MODULE_AUTHOR("Freescale Semiconductor, Inc."); | 784 | MODULE_AUTHOR("Freescale Semiconductor, Inc."); |
795 | MODULE_DESCRIPTION("MXS ASoC SAIF driver"); | 785 | MODULE_DESCRIPTION("MXS ASoC SAIF driver"); |
796 | MODULE_LICENSE("GPL"); | 786 | MODULE_LICENSE("GPL"); |
diff --git a/sound/soc/mxs/mxs-sgtl5000.c b/sound/soc/mxs/mxs-sgtl5000.c index 1c57f6630a48..60f052b7cf22 100644 --- a/sound/soc/mxs/mxs-sgtl5000.c +++ b/sound/soc/mxs/mxs-sgtl5000.c | |||
@@ -105,6 +105,7 @@ static struct snd_soc_dai_link mxs_sgtl5000_dai[] = { | |||
105 | 105 | ||
106 | static struct snd_soc_card mxs_sgtl5000 = { | 106 | static struct snd_soc_card mxs_sgtl5000 = { |
107 | .name = "mxs_sgtl5000", | 107 | .name = "mxs_sgtl5000", |
108 | .owner = THIS_MODULE, | ||
108 | .dai_link = mxs_sgtl5000_dai, | 109 | .dai_link = mxs_sgtl5000_dai, |
109 | .num_links = ARRAY_SIZE(mxs_sgtl5000_dai), | 110 | .num_links = ARRAY_SIZE(mxs_sgtl5000_dai), |
110 | }; | 111 | }; |
@@ -156,17 +157,7 @@ static struct platform_driver mxs_sgtl5000_audio_driver = { | |||
156 | .remove = __devexit_p(mxs_sgtl5000_remove), | 157 | .remove = __devexit_p(mxs_sgtl5000_remove), |
157 | }; | 158 | }; |
158 | 159 | ||
159 | static int __init mxs_sgtl5000_init(void) | 160 | module_platform_driver(mxs_sgtl5000_audio_driver); |
160 | { | ||
161 | return platform_driver_register(&mxs_sgtl5000_audio_driver); | ||
162 | } | ||
163 | module_init(mxs_sgtl5000_init); | ||
164 | |||
165 | static void __exit mxs_sgtl5000_exit(void) | ||
166 | { | ||
167 | platform_driver_unregister(&mxs_sgtl5000_audio_driver); | ||
168 | } | ||
169 | module_exit(mxs_sgtl5000_exit); | ||
170 | 161 | ||
171 | MODULE_AUTHOR("Freescale Semiconductor, Inc."); | 162 | MODULE_AUTHOR("Freescale Semiconductor, Inc."); |
172 | MODULE_DESCRIPTION("MXS ALSA SoC Machine driver"); | 163 | MODULE_DESCRIPTION("MXS ALSA SoC Machine driver"); |