From d66227659c152423ba79cb3d66f8eb8fdb04f3b3 Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Thu, 22 Sep 2011 19:48:53 +0800 Subject: SAUCE: adjust sgtl5000 and S/PDIF order BugLink: http://bugs.launchpad.net/bugs/857057 After adding support for S/PDIF audio output routing to HDMI, the SGTL5000 became card #1, which was no longer #0, thus making it no longer the default ALSA card. imx_sgtl5000_init() doesn't need to be late_initcall(), module_init() works just all right. Signed-off-by: Eric Miao --- sound/soc/codecs/Makefile | 4 ++-- sound/soc/imx/imx-sgtl5000.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 92bdee5b68a6..303c738a82af 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -17,9 +17,9 @@ snd-soc-da7210-objs := da7210.o snd-soc-dmic-objs := dmic.o snd-soc-l3-objs := l3.o snd-soc-max98088-objs := max98088.o -snd-soc-mxc-spdif-objs := mxc_spdif.o snd-soc-pcm3008-objs := pcm3008.o snd-soc-sgtl5000-objs := sgtl5000.o +snd-soc-mxc-spdif-objs := mxc_spdif.o snd-soc-alc5623-objs := alc5623.o snd-soc-spdif-objs := spdif_transciever.o snd-soc-ssm2602-objs := ssm2602.o @@ -99,10 +99,10 @@ obj-$(CONFIG_SND_SOC_DMIC) += snd-soc-dmic.o obj-$(CONFIG_SND_SOC_L3) += snd-soc-l3.o obj-$(CONFIG_SND_SOC_JZ4740_CODEC) += snd-soc-jz4740-codec.o obj-$(CONFIG_SND_SOC_MAX98088) += snd-soc-max98088.o -obj-$(CONFIG_SND_SOC_MXC_SPDIF) += snd-soc-mxc-spdif.o obj-$(CONFIG_SND_SOC_PCM3008) += snd-soc-pcm3008.o obj-$(CONFIG_SND_SOC_ALC5623) += snd-soc-alc5623.o obj-$(CONFIG_SND_SOC_SGTL5000) += snd-soc-sgtl5000.o +obj-$(CONFIG_SND_SOC_MXC_SPDIF) += snd-soc-mxc-spdif.o obj-$(CONFIG_SND_SOC_SPDIF) += snd-soc-spdif.o obj-$(CONFIG_SND_SOC_SSM2602) += snd-soc-ssm2602.o obj-$(CONFIG_SND_SOC_STAC9766) += snd-soc-stac9766.o diff --git a/sound/soc/imx/imx-sgtl5000.c b/sound/soc/imx/imx-sgtl5000.c index 82ee8eca8680..0ff8ee00b3c2 100644 --- a/sound/soc/imx/imx-sgtl5000.c +++ b/sound/soc/imx/imx-sgtl5000.c @@ -388,7 +388,7 @@ static void __exit imx_sgtl5000_exit(void) platform_device_unregister(imx_sgtl5000_snd_device); } -late_initcall(imx_sgtl5000_init); +module_init(imx_sgtl5000_init); module_exit(imx_sgtl5000_exit); MODULE_AUTHOR("Sascha Hauer "); -- cgit v1.2.3