* [PATCH 2/5] colibri-pxa300: fix ac97 init on pxa310 @ 2010-07-08 17:04 pieterg 2010-07-08 20:00 ` Marek Vasut 2010-07-09 7:02 ` Daniel Mack 0 siblings, 2 replies; 4+ messages in thread From: pieterg @ 2010-07-08 17:04 UTC (permalink / raw) To: linux-arm-kernel 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> ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/5] colibri-pxa300: fix ac97 init on pxa310 2010-07-08 17:04 [PATCH 2/5] colibri-pxa300: fix ac97 init on pxa310 pieterg @ 2010-07-08 20:00 ` Marek Vasut 2010-07-09 7:02 ` Daniel Mack 1 sibling, 0 replies; 4+ messages in thread From: Marek Vasut @ 2010-07-08 20:00 UTC (permalink / raw) To: linux-arm-kernel Dne ?t 8. ?ervence 2010 19:04:05 pieterg napsal(a): > The wrong CONFIG defines were checked, and the <mach/audio.h> > include was missing > > Signed-off-by: pieter <p.grimmerink@inepro.com> > --- > arch/arm/mach-pxa/colibri-pxa300.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-pxa/colibri-pxa300.c > b/arch/arm/mach-pxa/colibri-pxa300.c > index 45c23fd..e7762ae 100644 > --- a/arch/arm/mach-pxa/colibri-pxa300.c > +++ b/arch/arm/mach-pxa/colibri-pxa300.c > @@ -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, It looks correct ... Acked-by: Marek Vasut <marek.vasut@gmail.com> ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/5] colibri-pxa300: fix ac97 init on pxa310 2010-07-08 17:04 [PATCH 2/5] colibri-pxa300: fix ac97 init on pxa310 pieterg 2010-07-08 20:00 ` Marek Vasut @ 2010-07-09 7:02 ` Daniel Mack 2010-07-13 2:30 ` Eric Miao 1 sibling, 1 reply; 4+ messages in thread From: Daniel Mack @ 2010-07-09 7:02 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jul 08, 2010 at 07:04:05PM +0200, pieterg wrote: > The wrong CONFIG defines were checked, and the <mach/audio.h> > include was missing > > Signed-off-by: pieter <p.grimmerink@inepro.com> Acked-by: Daniel Mack <daniel@caiaq.de> > --- > arch/arm/mach-pxa/colibri-pxa300.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-pxa/colibri-pxa300.c > b/arch/arm/mach-pxa/colibri-pxa300.c > index 45c23fd..e7762ae 100644 > --- a/arch/arm/mach-pxa/colibri-pxa300.c > +++ b/arch/arm/mach-pxa/colibri-pxa300.c > @@ -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, > -- > 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/5] colibri-pxa300: fix ac97 init on pxa310 2010-07-09 7:02 ` Daniel Mack @ 2010-07-13 2:30 ` Eric Miao 0 siblings, 0 replies; 4+ messages in thread From: Eric Miao @ 2010-07-13 2:30 UTC (permalink / raw) To: linux-arm-kernel On Fri, Jul 9, 2010 at 3:02 PM, Daniel Mack <daniel@caiaq.de> wrote: > On Thu, Jul 08, 2010 at 07:04:05PM +0200, pieterg wrote: >> The wrong CONFIG defines were checked, and the <mach/audio.h> >> include was missing >> >> Signed-off-by: pieter <p.grimmerink@inepro.com> > > Acked-by: Daniel Mack <daniel@caiaq.de> > Thanks. I'll pick this first into 'fix' branch. > >> --- >> ?arch/arm/mach-pxa/colibri-pxa300.c | ? ?4 +++- >> ?1 files changed, 3 insertions(+), 1 deletions(-) >> >> diff --git a/arch/arm/mach-pxa/colibri-pxa300.c >> b/arch/arm/mach-pxa/colibri-pxa300.c >> index 45c23fd..e7762ae 100644 >> --- a/arch/arm/mach-pxa/colibri-pxa300.c >> +++ b/arch/arm/mach-pxa/colibri-pxa300.c >> @@ -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, >> -- >> 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 > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-07-13 2:30 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-07-08 17:04 [PATCH 2/5] colibri-pxa300: fix ac97 init on pxa310 pieterg 2010-07-08 20:00 ` Marek Vasut 2010-07-09 7:02 ` Daniel Mack 2010-07-13 2:30 ` Eric Miao
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).