summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/cm-x300.c
diff options
context:
space:
mode:
authorIgor Grinberg <grinberg@compulab.co.il>2009-10-14 09:20:20 +0200
committerEric Miao <eric.y.miao@gmail.com>2009-12-01 09:03:07 +0800
commit74e74defd6c471fc7ec108e64cb953164940a122 (patch)
treea8cde3f6da4c76cb35f289cc71264eebd16bf7ce /arch/arm/mach-pxa/cm-x300.c
parent83e560eee12b3215c193338496090838e5f6d1cb (diff)
[ARM] pxa/cm-x300: add ac97 controller registration
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/cm-x300.c')
-rw-r--r--arch/arm/mach-pxa/cm-x300.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c
index ecee7e82911..8726dc7c73a 100644
--- a/arch/arm/mach-pxa/cm-x300.c
+++ b/arch/arm/mach-pxa/cm-x300.c
@@ -40,6 +40,7 @@
#include <mach/ohci.h>
#include <plat/i2c.h>
#include <plat/pxa3xx_nand.h>
+#include <mach/audio.h>
#include <asm/mach/map.h>
@@ -305,6 +306,15 @@ static void __init cm_x300_init_spi(void)
static inline void cm_x300_init_spi(void) {}
#endif
+#if defined(CONFIG_SND_PXA2XX_LIB_AC97)
+static void __init cm_x300_init_ac97(void)
+{
+ pxa_set_ac97_info(NULL);
+}
+#else
+static inline void cm_x300_init_ac97(void) {}
+#endif
+
#if defined(CONFIG_MTD_NAND_PXA3xx) || defined(CONFIG_MTD_NAND_PXA3xx_MODULE)
static struct mtd_partition cm_x300_nand_partitions[] = {
[0] = {
@@ -531,6 +541,7 @@ static void __init cm_x300_init(void)
cm_x300_init_i2c();
cm_x300_init_spi();
cm_x300_init_rtc();
+ cm_x300_init_ac97();
}
static void __init cm_x300_fixup(struct machine_desc *mdesc, struct tag *tags,