pxa/cm-x300: fix ffuart registration

PATCH New Igor Grinberg 3 participants 6 messages Jul 20, 2010 – Aug 5, 2010

Subsystems (3)

Arm (32-bit) Arm sub-architectures PXA2xx/PXA3xx support

lore

Share & tools

lore

Igor Grinberg

author

2010-07-20 07:58 UTC #0 lore raw

PATCH 1/1 pxa/cm-x300: fix ffuart registration

ffuart is available on cm-x300 only with pxa300.

Signed-off-by Igor Grinberg <[email protected]>

---
 arch/arm/mach-pxa/cm-x300.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

arch/arm/mach-pxa/cm-x300.c +2 -1

index fdda6be..d717b49 100644
@@ -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();

Signature · 1 line

1.7.1

Igor Grinberg

author

2010-08-01 12:10 UTC #2 lore raw

PATCH 1/1 pxa/cm-x300: fix ffuart registration

Quoted 8 lines · Eric Miao

Quoted 4 lines · Igor Grinberg
ffuart is available on cm-x300 only with pxa300.
Signed-off-by Igor Grinberg <[email protected]>
Applied.

I can see it neither in fix, nor in devel branches on your git.kernel.org. Do you keep it locally?

Thanks

Quoted 27 lines

Quoted 26 lines

  
---
 arch/arm/mach-pxa/cm-x300.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

arch/arm/mach-pxa/cm-x300.c +2 -2

index fdda6be..d717b49 100644
@@ -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

Signature · 2 lines

Regards,
Igor.

Eric Miao

2010-08-04 03:37 UTC #3 lore raw

PATCH 1/1 pxa/cm-x300: fix ffuart registration

Quoted 5 lines · Igor Grinberg

Quoted 4 lines · Eric Miao
Quoted 2 lines · Igor Grinberg
ffuart is available on cm-x300 only with pxa300.

Quoted 7 lines

Quoted 4 lines
Quoted 2 lines
Signed-off-by Igor Grinberg <[email protected]>
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?

Quoted 36 lines

Thanks
Quoted 19 lines
Quoted 19 lines
---
?arch/arm/mach-pxa/cm-x300.c | ? ?3 ++-
?1 files changed, 2 insertions(+), 1 deletions(-)
arch/arm/mach-pxa/cm-x300.c +2 -1
index fdda6be..d717b49 100644
@@ -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);
 
Quoted 8 lines
Quoted 7 lines
arch/arm/mach-pxa/cm-x300.c +0 -1
 ? ? ? ?cm_x300_init_da9030();
 ? ? ? ?cm_x300_init_dm9000();
--
1.7.1
--
Regards,
Igor.

Greg KH

2010-08-04 17:06 UTC #4 lore raw

PATCH 1/1 pxa/cm-x300: fix ffuart registration

Quoted 14 lines · Eric Miao

Quoted 5 lines · Igor Grinberg
Quoted 4 lines · Eric Miao
Quoted 2 lines · Igor Grinberg
ffuart is available on cm-x300 only with pxa300.
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Signed-off-by Igor Grinberg <[email protected]>
Applied.
I can see it neither in fix, nor in devel branches on your git.kernel.org. Do you keep it locally?

Quoted 7 lines

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 <[email protected]>
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

Eric Miao

2010-08-05 03:06 UTC #5 lore raw

PATCH 1/1 pxa/cm-x300: fix ffuart registration

Quoted 23 lines · Greg KH

Quoted 14 lines · Eric Miao
Quoted 5 lines · Igor Grinberg
Quoted 4 lines · Eric Miao
Quoted 2 lines · Igor Grinberg
ffuart is available on cm-x300 only with pxa300.
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Signed-off-by Igor Grinberg <[email protected]>
Applied.
I can see it neither in fix, nor in devel branches on your git.kernel.org. Do you keep it locally?
Quoted 7 lines
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?

Quoted 9 lines

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 <[email protected]>
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.

Quoted 4 lines

thanks,
greg k-h