colibri-pxa300: fix ac97 init on pxa310
PATCH 2/5 colibri-pxa300: fix ac97 init on pxa310
An embedded and charset-unspecified text was scrubbed...
Name: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100708/7a702cd2/attachment.ksh>
PATCH 2/5 colibri-pxa300: fix ac97 init on pxa310
Dne ?t 8. ?ervence 2010 19:04:05 pieterg napsal(a):
Quoted 22 lines
The wrong CONFIG defines were checked, and the <
mach/audio.h> include was missingSigned-off-by pieter <[email protected]>--- arch/arm/mach-pxa/colibri-pxa300.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)arch/arm/mach-pxa/colibri-pxa300.c +1
-0@@ -26,6 +26,7 @@#include <mach/colibri.h> #include <mach/ohci.h> #include <mach/pxafb.h> +#include <mach/audio.h> #include "generic.h" #include "devices.h"
arch/arm/mach-pxa/colibri-pxa300.c static void __init colibri_pxa300_init_lcd(void) · line 153
Quoted 9 lines
arch/arm/mach-pxa/colibri-pxa300.c +2
-1@@ -145,7 +146,8 @@ static void __init colibri_pxa300_init_lcd(void)static inline void colibri_pxa300_init_lcd (void ) {}#endif /* CONFIG_FB_PXA || CONFIG_FB_PXA_MODULE */ -#if defined(SND_AC97_CODEC ) || defined(SND_AC97_CODEC_MODULE ) +#if defined(CONFIG_SND_AC97_CODEC ) || \ + defined(CONFIG_SND_AC97_CODEC_MODULE )static mfp_cfg_t colibri_pxa310_ac97_pin_config[]__initdata = {GPIO24_AC97_SYSCLK , GPIO23_AC97_nACRESET,
It looks correct ...
PATCH 2/5 colibri-pxa300: fix ac97 init on pxa310
In reply to pietergQuoted 4 lines · pieterg
The wrong CONFIG defines were checked, and the <
mach/audio.h> include was missingSigned-off-by pieter <[email protected]>
Quoted 34 lines
--- arch/arm/mach-pxa/colibri-pxa300.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)arch/arm/mach-pxa/colibri-pxa300.c +3
-1@@ -26,6 +26,7 @@#include <mach/colibri.h> #include <mach/ohci.h> #include <mach/pxafb.h> +#include <mach/audio.h> #include "generic.h" #include "devices.h" @@ -145,7 +146,8 @@ static void __init colibri_pxa300_init_lcd(void)static inline void colibri_pxa300_init_lcd (void ) {}#endif /* CONFIG_FB_PXA || CONFIG_FB_PXA_MODULE */ -#if defined(SND_AC97_CODEC ) || defined(SND_AC97_CODEC_MODULE ) +#if defined(CONFIG_SND_AC97_CODEC ) || \ + defined(CONFIG_SND_AC97_CODEC_MODULE )static mfp_cfg_t colibri_pxa310_ac97_pin_config[]__initdata = {GPIO24_AC97_SYSCLK , GPIO23_AC97_nACRESET,Signature · 6 lines
1.6.5.rc1.44.ga1675 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 2/5 colibri-pxa300: fix ac97 init on pxa310
Quoted 8 lines · Daniel Mack
Quoted 4 lines · pieterg
The wrong CONFIG defines were checked, and the <
mach/audio.h> include was missingSigned-off-by pieter <[email protected]>Acked-by Daniel Mack <[email protected]>
Thanks. I'll pick this first into 'fix' branch.
Quoted 41 lines
Quoted 31 lines
---
?arch/arm/mach-pxa/colibri-pxa300.c | ? ?4 +++-
?1 files changed, 3 insertions(+), 1 deletions(-)arch/arm/mach-pxa/colibri-pxa300.c +0
-0@@ -26,6 +26,7 @@?#include <
mach/colibri.h>
?#include <mach/ohci.h>
?#include <mach/pxafb.h>
+#include <mach/audio.h>?#include "
generic.h"
?#include "devices.h"arch/arm/mach-pxa/colibri-pxa300.c +0
-0@@ -145,7 +146,8 @@ static void __init colibri_pxa300_init_lcd(void) ?static inline void colibri_pxa300_init_lcd(void) {}?#endif /*
CONFIG_FB_PXA||CONFIG_FB_PXA_MODULE*/arch/arm/mach-pxa/colibri-pxa300.c +2
-1-#if defined(SND_AC97_CODEC ) || defined(SND_AC97_CODEC_MODULE ) +#if ?defined(CONFIG_SND_AC97_CODEC) || \ + ? ? defined(CONFIG_SND_AC97_CODEC_MODULE)?static
mfp_cfg_tcolibri_pxa310_ac97_pin_config[]__initdata= { ? ? ?GPIO24_AC97_SYSCLK,
? ? ?GPIO23_AC97_nACRESET,
--
1.6.5.rc1.44.ga1675Quoted 4 lines
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel