Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c63a5751 authored by Mike Rapoport's avatar Mike Rapoport Committed by Eric Miao
Browse files

[ARM] pxa/em-x270: always register AC97 controller device 



After commit 6b849bcf (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: default avatarMike Rapoport <mike@compulab.co.il>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent a37ed431

arch/arm/mach-pxa/em-x270.c

+6 −2
Original line number Diff line number Diff line
@@ -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) {}