Skip to content

Commit

Permalink
[ARM] pxa/cm-x300: add ac97 controller registration
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Igor Grinberg authored and Eric Miao committed Dec 1, 2009
1 parent 83e560e commit 74e74de
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions arch/arm/mach-pxa/cm-x300.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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] = {
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 74e74de

Please sign in to comment.