Home » Mailing list archives » git-commits-head » 2009 » June » 22

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

Previous thread: [ARM] pxa: register wm8731 explicitly for corgi and poodle by Linux Kernel Mailing List on Monday, June 22, 2009 - 4:59 pm. (1 message)

Next thread: [ARM] VIC: Fix resume sources usage by Linux Kernel Mailing List on Monday, June 22, 2009 - 4:59 pm. (1 message)
[view original message]
From: Linux Kernel Mailing List
Subject: [ARM] pxa/em-x270: always register AC97 controller device
Date: Monday, June 22, 2009 - 4:59 pm

Gitweb:     http://git.kernel.org/linus/c63a5751d971b07d8cd80f4d4aae75c676665a3b
Commit:     c63a5751d971b07d8cd80f4d4aae75c676665a3b
Parent:     a37ed43115b70e832c7e8cc7dabd026d127ad9db
Author:     Mike Rapoport <mike@compulab.co.il>
AuthorDate: Mon May 11 15:06:16 2009 +0300
Committer:  Eric Miao <eric.y.miao@gmail.com>
CommitDate: Tue Jun 16 21:03:34 2009 +0800

    [ARM] pxa/em-x270: always register AC97 controller device
    
    After commit 6b849bcff0004aa5dd216b4d3eb56f51c9df8a72 (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>
---
 arch/arm/mach-pxa/em-x270.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
index 5184a57..5343d1f 100644
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -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) {}
--


[ message continues ]
Previous thread: [ARM] pxa: register wm8731 explicitly for corgi and poodle by Linux Kernel Mailing List on Monday, June 22, 2009 - 4:59 pm. (1 message)

Next thread: [ARM] VIC: Fix resume sources usage by Linux Kernel Mailing List on Monday, June 22, 2009 - 4:59 pm. (1 message)