* [PATCH] [ARM] pxa/cm-x300: fix ffuart registration @ 2010-07-20 7:58 Igor Grinberg 2010-07-20 10:54 ` Eric Miao 0 siblings, 1 reply; 6+ messages in thread From: Igor Grinberg @ 2010-07-20 7:58 UTC (permalink / raw) To: linux-arm-kernel ffuart is available on cm-x300 only with pxa300. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> --- arch/arm/mach-pxa/cm-x300.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c index fdda6be..d717b49 100644 --- a/arch/arm/mach-pxa/cm-x300.c +++ b/arch/arm/mach-pxa/cm-x300.c @@ -745,9 +745,10 @@ static void __init cm_x300_init(void) { cm_x300_init_mfp(); - pxa_set_ffuart_info(NULL); pxa_set_btuart_info(NULL); pxa_set_stuart_info(NULL); + if (cpu_is_pxa300()) + pxa_set_ffuart_info(NULL); cm_x300_init_da9030(); cm_x300_init_dm9000(); -- 1.7.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] [ARM] pxa/cm-x300: fix ffuart registration 2010-07-20 7:58 [PATCH] [ARM] pxa/cm-x300: fix ffuart registration Igor Grinberg @ 2010-07-20 10:54 ` Eric Miao 2010-08-01 12:10 ` Igor Grinberg 0 siblings, 1 reply; 6+ messages in thread From: Eric Miao @ 2010-07-20 10:54 UTC (permalink / raw) To: linux-arm-kernel On Tue, Jul 20, 2010 at 9:58 AM, Igor Grinberg <grinberg@compulab.co.il> wrote: > ffuart is available on cm-x300 only with pxa300. > > Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Applied. > --- > ?arch/arm/mach-pxa/cm-x300.c | ? ?3 ++- > ?1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c > index fdda6be..d717b49 100644 > --- a/arch/arm/mach-pxa/cm-x300.c > +++ b/arch/arm/mach-pxa/cm-x300.c > @@ -745,9 +745,10 @@ static void __init cm_x300_init(void) > ?{ > ? ? ? ?cm_x300_init_mfp(); > > - ? ? ? pxa_set_ffuart_info(NULL); > ? ? ? ?pxa_set_btuart_info(NULL); > ? ? ? ?pxa_set_stuart_info(NULL); > + ? ? ? if (cpu_is_pxa300()) > + ? ? ? ? ? ? ? pxa_set_ffuart_info(NULL); > > ? ? ? ?cm_x300_init_da9030(); > ? ? ? ?cm_x300_init_dm9000(); > -- > 1.7.1 > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] [ARM] pxa/cm-x300: fix ffuart registration 2010-07-20 10:54 ` Eric Miao @ 2010-08-01 12:10 ` Igor Grinberg 2010-08-04 3:37 ` Eric Miao 0 siblings, 1 reply; 6+ messages in thread From: Igor Grinberg @ 2010-08-01 12:10 UTC (permalink / raw) To: linux-arm-kernel On 07/20/10 13:54, Eric Miao wrote: > On Tue, Jul 20, 2010 at 9:58 AM, Igor Grinberg <grinberg@compulab.co.il> wrote: > >> ffuart is available on cm-x300 only with pxa300. >> >> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> >> > Applied. > I can see it neither in fix, nor in devel branches on your git.kernel.org. Do you keep it locally? Thanks > >> --- >> arch/arm/mach-pxa/cm-x300.c | 3 ++- >> 1 files changed, 2 insertions(+), 1 deletions(-) >> >> diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c >> index fdda6be..d717b49 100644 >> --- a/arch/arm/mach-pxa/cm-x300.c >> +++ b/arch/arm/mach-pxa/cm-x300.c >> @@ -745,9 +745,10 @@ static void __init cm_x300_init(void) >> { >> cm_x300_init_mfp(); >> >> - pxa_set_ffuart_info(NULL); >> pxa_set_btuart_info(NULL); >> pxa_set_stuart_info(NULL); >> + if (cpu_is_pxa300()) >> + pxa_set_ffuart_info(NULL); >> >> cm_x300_init_da9030(); >> cm_x300_init_dm9000(); >> -- >> 1.7.1 >> >> >> > -- Regards, Igor. ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] [ARM] pxa/cm-x300: fix ffuart registration 2010-08-01 12:10 ` Igor Grinberg @ 2010-08-04 3:37 ` Eric Miao 2010-08-04 17:06 ` Greg KH 0 siblings, 1 reply; 6+ messages in thread From: Eric Miao @ 2010-08-04 3:37 UTC (permalink / raw) To: linux-arm-kernel On Sun, Aug 1, 2010 at 8:10 PM, Igor Grinberg <grinberg@compulab.co.il> wrote: > On 07/20/10 13:54, Eric Miao wrote: >> On Tue, Jul 20, 2010 at 9:58 AM, Igor Grinberg <grinberg@compulab.co.il> wrote: >> >>> ffuart is available on cm-x300 only with pxa300. >>> >>> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> >>> >> Applied. >> > > I can see it neither in fix, nor in devel branches on your git.kernel.org. > Do you keep it locally? Sorry it's in my local tree and missed the -rc phase. I'll push it within this merge window. Cc'ed stable and GregKH. Greg, Could you help pick this simple oneliner to -stable? Or we'd better wait a while until this appears in Linus' tree? > > Thanks > >> >>> --- >>> ?arch/arm/mach-pxa/cm-x300.c | ? ?3 ++- >>> ?1 files changed, 2 insertions(+), 1 deletions(-) >>> >>> diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c >>> index fdda6be..d717b49 100644 >>> --- a/arch/arm/mach-pxa/cm-x300.c >>> +++ b/arch/arm/mach-pxa/cm-x300.c >>> @@ -745,9 +745,10 @@ static void __init cm_x300_init(void) >>> ?{ >>> ? ? ? ?cm_x300_init_mfp(); >>> >>> - ? ? ? pxa_set_ffuart_info(NULL); >>> ? ? ? ?pxa_set_btuart_info(NULL); >>> ? ? ? ?pxa_set_stuart_info(NULL); >>> + ? ? ? if (cpu_is_pxa300()) >>> + ? ? ? ? ? ? ? pxa_set_ffuart_info(NULL); >>> >>> ? ? ? ?cm_x300_init_da9030(); >>> ? ? ? ?cm_x300_init_dm9000(); >>> -- >>> 1.7.1 >>> >>> >>> >> > > -- > Regards, > Igor. > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] [ARM] pxa/cm-x300: fix ffuart registration 2010-08-04 3:37 ` Eric Miao @ 2010-08-04 17:06 ` Greg KH 2010-08-05 3:06 ` Eric Miao 0 siblings, 1 reply; 6+ messages in thread From: Greg KH @ 2010-08-04 17:06 UTC (permalink / raw) To: linux-arm-kernel On Wed, Aug 04, 2010 at 11:37:33AM +0800, Eric Miao wrote: > On Sun, Aug 1, 2010 at 8:10 PM, Igor Grinberg <grinberg@compulab.co.il> wrote: > > On 07/20/10 13:54, Eric Miao wrote: > >> On Tue, Jul 20, 2010 at 9:58 AM, Igor Grinberg <grinberg@compulab.co.il> wrote: > >> > >>> ffuart is available on cm-x300 only with pxa300. > >>> > >>> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> > >>> > >> Applied. > >> > > > > I can see it neither in fix, nor in devel branches on your git.kernel.org. > > Do you keep it locally? > > Sorry it's in my local tree and missed the -rc phase. I'll push it within > this merge window. Cc'ed stable and GregKH. > > Greg, > > Could you help pick this simple oneliner to -stable? Or we'd better > wait a while until this appears in Linus' tree? I am not allowed to take a patch in the stable tree unless it is already in Linus's tree, sorry. So I'll have to wait until then. You do know about adding a: Cc: stable <stable@kernel.org> to the signed-off-by area in the patch which will automatically notify me when it goes into Linus's tree to be picked up for the next stable releases, right? thanks, greg k-h ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] [ARM] pxa/cm-x300: fix ffuart registration 2010-08-04 17:06 ` Greg KH @ 2010-08-05 3:06 ` Eric Miao 0 siblings, 0 replies; 6+ messages in thread From: Eric Miao @ 2010-08-05 3:06 UTC (permalink / raw) To: linux-arm-kernel On Thu, Aug 5, 2010 at 1:06 AM, Greg KH <gregkh@suse.de> wrote: > On Wed, Aug 04, 2010 at 11:37:33AM +0800, Eric Miao wrote: >> On Sun, Aug 1, 2010 at 8:10 PM, Igor Grinberg <grinberg@compulab.co.il> wrote: >> > On 07/20/10 13:54, Eric Miao wrote: >> >> On Tue, Jul 20, 2010 at 9:58 AM, Igor Grinberg <grinberg@compulab.co.il> wrote: >> >> >> >>> ffuart is available on cm-x300 only with pxa300. >> >>> >> >>> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> >> >>> >> >> Applied. >> >> >> > >> > I can see it neither in fix, nor in devel branches on your git.kernel.org. >> > Do you keep it locally? >> >> Sorry it's in my local tree and missed the -rc phase. I'll push it within >> this merge window. Cc'ed stable and GregKH. >> >> Greg, >> >> Could you help pick this simple oneliner to -stable? Or we'd better >> wait a while until this appears in Linus' tree? > > I am not allowed to take a patch in the stable tree unless it is already > in Linus's tree, sorry. > > So I'll have to wait until then. ?You do know about adding a: > ? ? ? ?Cc: stable <stable@kernel.org> > to the signed-off-by area in the patch which will automatically notify > me when it goes into Linus's tree to be picked up for the next stable > releases, right? > OK, thanks. > thanks, > > greg k-h > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-08-05 3:06 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-07-20 7:58 [PATCH] [ARM] pxa/cm-x300: fix ffuart registration Igor Grinberg 2010-07-20 10:54 ` Eric Miao 2010-08-01 12:10 ` Igor Grinberg 2010-08-04 3:37 ` Eric Miao 2010-08-04 17:06 ` Greg KH 2010-08-05 3:06 ` 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).