Re: [Patch 2.6.27] fix booting on Sharp Zaurus c3000

[Pavel Machek]

Hi!

> > > > > Thanks for the effort, but it looks like it did not make it, right?
> > > > 
> > > > Correct - Linus was unpredictable and released 2.6.27 that evening,
> > > > four days early giving me no time to push the fix to him.
> > > > 
> > > > However, it's gone in as part of the first ARM merge, so should be in
> > > > -rc1.
> > > 
> > > Is it in -stable?  if not, is it considered as -stable material?
> > 
> > Yes, I guess it should go to stable.
> > 
> > commit 69fc7eed5f56bce15b239e5110de2575a6970df4
> > Author: Dmitry Baryshkov <dbaryshkov@xxxxxxxxx>
> > Date:   Thu Oct 9 16:58:13 2008 +0100
> > 
> >     [ARM] 5300/1: fixup spitz reset during boot
> >     
> >     Some machines don't have the pullup/down on their reset
> >     pin, so configuring the reset generating pin as input makes
> >     them reset immediately. Fix that by making reset pin direction
> >     configurable.
> >     
> > Signed-off-by: Dmitry Baryshkov <dbaryshkov@xxxxxxxxx>
> > Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
> > Signed-off-by: Pavel Machek <pavel@xxxxxxx>
> > 
> > diff --git a/arch/arm/mach-pxa/include/mach/reset.h b/arch/arm/mach-pxa/include/mach/reset.h
> > index 9489a48..7b8842c 100644
> > --- a/arch/arm/mach-pxa/include/mach/reset.h
> > +++ b/arch/arm/mach-pxa/include/mach/reset.h
> > @@ -10,9 +10,12 @@
> >  extern unsigned int reset_status;
> >  extern void clear_reset_status(unsigned int mask);
> >  
> > -/*
> > - * register GPIO as reset generator
> > +/**
> > + * init_gpio_reset() - register GPIO as reset generator
> > + *
> > + * @gpio - gpio nr
> > + * @output - set gpio as out/low instead of input during normal work
> 
> Use colon (':') after function parameters, not hyphen/dash.

Okay, sorry about that. If I promise to fix that in mainline, will you
let me apply the -stable patch?

...I believe this one should go in. Documentation problem is not that
bad, and it fixes booting. 

Alternatively, I can submit fixed patch, but it will be in trivial way
different from what is currently in mainline... which is okay for this
I guess.

Greg, will you take the patch as-is, or can you simply replace - with
: or do you want me to submit new one?
									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/