Skip to content

Commit

Permalink
[ARM] pxa/em-x270: always register AC97 controller device
Browse files Browse the repository at this point in the history
After commit 6b849bc (ASoC: Convert PXA
AC97 driver to probe with the platform device) AC97 controller device
should be registered explicitly for both ASoC and generic AC97 drivers

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
  • Loading branch information
Mike Rapoport authored and Eric Miao committed Jun 16, 2009
1 parent a37ed43 commit c63a575
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions arch/arm/mach-pxa/em-x270.c
Original file line number Diff line number Diff line change
Expand Up @@ -839,10 +839,14 @@ static void __init em_x270_init_spi(void)
static inline void em_x270_init_spi(void) {}
#endif

#if defined(CONFIG_SND_PXA2XX_AC97) || defined(CONFIG_SND_PXA2XX_AC97_MODULE)
#if defined(CONFIG_SND_PXA2XX_AC97_LIB)
static pxa2xx_audio_ops_t em_x270_ac97_info = {
.reset_gpio = 113,
};

static void __init em_x270_init_ac97(void)
{
pxa_set_ac97_info(NULL);
pxa_set_ac97_info(&em_x270_ac97_info);
}
#else
static inline void em_x270_init_ac97(void) {}
Expand Down

0 comments on commit c63a575

Please sign in to comment.