[GIT PULL v3] pxa: patches for v2.6.38-rc

[GIT PULL v3] pxa: patches for v2.6.38-rc

[Eric Miao]

Hi Russell,

I rebased the branch on top of devel-stable. The conflict in irq.c is
fixed. And there is a one-liner patch fixing a building issue in spitz.c
missing of physmap.h. Please re-pull and let know any other issue.

Sorry for the inconvenience.

The following changes since commit 5b88128fd70dcf0d5d7c0ae7d7849777ff925bde:

  ARM: plat-stmp3xxx: irq_data conversion. (2011-01-13 17:19:14 +0100)

are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git devel

Eric Miao (2):
      ARM: pxa: fix recursive calls in pxa_low_gpio_chip
      ARM: pxa: fix building issue of missing physmap.h

Marek Vasut (4):
      ARM: pxa: fix warning in zeus.c
      ARM: pxa: remove unused variable in clock-pxa3xx.c
      ARM: pxa: use cpu_has_ipr() consistently in irq.c
      ARM: pxa: fix suspend/resume array index miscalculation

Pavel Machek (1):
      ARM: sa1111: fix typo in sa1111_retrigger_lowirq()

Philip Rakity (2):
      ARM: mmp: MMP2 drive strength FAST using wrong value
      ARM: mmp: PXA910 drive strength FAST using wrong value

 arch/arm/common/sa1111.c                    |    2 +-
 arch/arm/mach-mmp/include/mach/mfp-mmp2.h   |    2 +-
 arch/arm/mach-mmp/include/mach/mfp-pxa910.h |    2 +-
 arch/arm/mach-pxa/clock-pxa3xx.c            |    1 -
 arch/arm/mach-pxa/irq.c                     |   53 ++++++++++-----------------
 arch/arm/mach-pxa/spitz.c                   |    1 +
 arch/arm/mach-pxa/zeus.c                    |    4 +-
 7 files changed, 26 insertions(+), 39 deletions(-)

[GIT PULL v3] pxa: patches for v2.6.38-rc

[Russell King - ARM Linux]

On Fri, Jan 14, 2011 at 11:08:59AM -0600, Eric Miao wrote:
> Hi Russell,
> 
> I rebased the branch on top of devel-stable. The conflict in irq.c is
> fixed. And there is a one-liner patch fixing a building issue in spitz.c
> missing of physmap.h. Please re-pull and let know any other issue.

Pulled cleanly, thanks.

[GIT PULL v3] pxa: patches for v2.6.38-rc

[Russell King - ARM Linux]

On Fri, Jan 14, 2011 at 05:31:47PM +0000, Russell King - ARM Linux wrote:
> On Fri, Jan 14, 2011 at 11:08:59AM -0600, Eric Miao wrote:
> > Hi Russell,
> > 
> > I rebased the branch on top of devel-stable. The conflict in irq.c is
> > fixed. And there is a one-liner patch fixing a building issue in spitz.c
> > missing of physmap.h. Please re-pull and let know any other issue.
> 
> Pulled cleanly, thanks.

Building my PXA config:

arch/arm/mach-pxa/irq.c:124: warning: initialization from incompatible pointer type
arch/arm/mach-pxa/irq.c:125: warning: initialization from incompatible pointer type
arch/arm/mach-pxa/irq.c:126: warning: initialization from incompatible pointer type
arch/arm/mach-pxa/irq.c:127: warning: initialization from incompatible pointer type

Seems the initializers want to be .irq_ack rather than .ack etc.

I also need to remove asm/pgtable.h from arch/arm/mach-pxa/generic.c:
  CC      arch/arm/mach-pxa/generic.o
In file included from arch/arm/include/asm/pgtable.h:461,
                 from arch/arm/mach-pxa/generic.c:26:
include/asm-generic/pgtable.h: In function ?ptep_test_and_clear_young?:
include/asm-generic/pgtable.h:29: error: dereferencing pointer to incomplete type

and I also got:
arch/arm/mach-pxa/tosa-bt.c: In function ?tosa_bt_probe?:
arch/arm/mach-pxa/tosa-bt.c:84: error: implicit declaration of function ?rfkill_set_led_trigger_name?

which looks like a missing dependency.

Do you want to fix these and send an updated pull?

[GIT PULL v3] pxa: patches for v2.6.38-rc

[Russell King - ARM Linux]

On Fri, Jan 14, 2011 at 09:49:00PM +0000, Russell King - ARM Linux wrote:
> I also need to remove asm/pgtable.h from arch/arm/mach-pxa/generic.c:
>   CC      arch/arm/mach-pxa/generic.o
> In file included from arch/arm/include/asm/pgtable.h:461,
>                  from arch/arm/mach-pxa/generic.c:26:
> include/asm-generic/pgtable.h: In function ?ptep_test_and_clear_young?:
> include/asm-generic/pgtable.h:29: error: dereferencing pointer to incomplete type

Looking through kautobuild, it seems this also affects
arch/arm/mach-sa1100/generic.c too, and is a recently introduced
regression (within the last 24 hours) in mainline.

[PATCH] Fix latest regression - pgtable.h (was: [GIT PULL v3] pxa: patches for v2.6.38-rc)

[Russell King - ARM Linux]

On Sat, Jan 15, 2011 at 12:02:15AM +0000, Russell King - ARM Linux wrote:
> On Fri, Jan 14, 2011 at 09:49:00PM +0000, Russell King - ARM Linux wrote:
> > I also need to remove asm/pgtable.h from arch/arm/mach-pxa/generic.c:
> >   CC      arch/arm/mach-pxa/generic.o
> > In file included from arch/arm/include/asm/pgtable.h:461,
> >                  from arch/arm/mach-pxa/generic.c:26:
> > include/asm-generic/pgtable.h: In function ?ptep_test_and_clear_young?:
> > include/asm-generic/pgtable.h:29: error: dereferencing pointer to incomplete type
> 
> Looking through kautobuild, it seems this also affects
> arch/arm/mach-sa1100/generic.c too, and is a recently introduced
> regression (within the last 24 hours) in mainline.

Hmm, it not only affects PXA, SA1100, but also H720x as well.  Let's kill
all instances with one patch:

8<-----
Subject: [PATCH] ARM: Fix build regression on SA11x0, PXA, and H720x targets

Build errors similar this appeared in todays kautobuild for the above
targets:

In file included from arch/arm/include/asm/pgtable.h:461,
                 from arch/arm/mach-pxa/generic.c:26:
include/asm-generic/pgtable.h: In function 'ptep_test_and_clear_young':
include/asm-generic/pgtable.h:29: error: dereferencing pointer to incomplete type

None of the .c files including asm/pgtable.h with this error is using
this header, so simply remove the include.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
 arch/arm/mach-h720x/h7201-eval.c |    1 -
 arch/arm/mach-h720x/h7202-eval.c |    1 -
 arch/arm/mach-pxa/generic.c      |    1 -
 arch/arm/mach-sa1100/generic.c   |    1 -
 4 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-h720x/h7201-eval.c b/arch/arm/mach-h720x/h7201-eval.c
index 79f0b89..629454d 100644
--- a/arch/arm/mach-h720x/h7201-eval.c
+++ b/arch/arm/mach-h720x/h7201-eval.c
@@ -23,7 +23,6 @@
 #include <asm/types.h>
 #include <asm/mach-types.h>
 #include <asm/page.h>
-#include <asm/pgtable.h>
 #include <asm/mach/arch.h>
 #include <mach/hardware.h>
 #include "common.h"
diff --git a/arch/arm/mach-h720x/h7202-eval.c b/arch/arm/mach-h720x/h7202-eval.c
index cc28b1e..e9f46b6 100644
--- a/arch/arm/mach-h720x/h7202-eval.c
+++ b/arch/arm/mach-h720x/h7202-eval.c
@@ -23,7 +23,6 @@
 #include <asm/types.h>
 #include <asm/mach-types.h>
 #include <asm/page.h>
-#include <asm/pgtable.h>
 #include <asm/mach/arch.h>
 #include <mach/irqs.h>
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c
index d6e15f7..f5d91ef 100644
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@ -22,7 +22,6 @@
 
 #include <mach/hardware.h>
 #include <asm/system.h>
-#include <asm/pgtable.h>
 #include <asm/mach/map.h>
 #include <asm/mach-types.h>
 
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c
index 59d14f0..e21f347 100644
--- a/arch/arm/mach-sa1100/generic.c
+++ b/arch/arm/mach-sa1100/generic.c
@@ -21,7 +21,6 @@
 #include <asm/div64.h>
 #include <mach/hardware.h>
 #include <asm/system.h>
-#include <asm/pgtable.h>
 #include <asm/mach/map.h>
 #include <asm/mach/flash.h>
 #include <asm/irq.h>
-- 
1.6.2.5

[GIT PULL v3] pxa: patches for v2.6.38-rc

[Eric Miao]

On Fri, Jan 14, 2011 at 3:49 PM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Fri, Jan 14, 2011 at 05:31:47PM +0000, Russell King - ARM Linux wrote:
>> On Fri, Jan 14, 2011 at 11:08:59AM -0600, Eric Miao wrote:
>> > Hi Russell,
>> >
>> > I rebased the branch on top of devel-stable. The conflict in irq.c is
>> > fixed. And there is a one-liner patch fixing a building issue in spitz.c
>> > missing of physmap.h. Please re-pull and let know any other issue.
>>
>> Pulled cleanly, thanks.
>
> Building my PXA config:
>
> arch/arm/mach-pxa/irq.c:124: warning: initialization from incompatible pointer type
> arch/arm/mach-pxa/irq.c:125: warning: initialization from incompatible pointer type
> arch/arm/mach-pxa/irq.c:126: warning: initialization from incompatible pointer type
> arch/arm/mach-pxa/irq.c:127: warning: initialization from incompatible pointer type
>
> Seems the initializers want to be .irq_ack rather than .ack etc.

You are right. Do you want me to have another patch on top or I
make the change back into the guilty commit and you re-pull? I'd
prefer the latter.

>
> I also need to remove asm/pgtable.h from arch/arm/mach-pxa/generic.c:
> ?CC ? ? ?arch/arm/mach-pxa/generic.o
> In file included from arch/arm/include/asm/pgtable.h:461,
> ? ? ? ? ? ? ? ? from arch/arm/mach-pxa/generic.c:26:
> include/asm-generic/pgtable.h: In function ?ptep_test_and_clear_young?:
> include/asm-generic/pgtable.h:29: error: dereferencing pointer to incomplete type
>
> and I also got:
> arch/arm/mach-pxa/tosa-bt.c: In function ?tosa_bt_probe?:
> arch/arm/mach-pxa/tosa-bt.c:84: error: implicit declaration of function ?rfkill_set_led_trigger_name?
>
> which looks like a missing dependency.
>
> Do you want to fix these and send an updated pull?
>

[GIT PULL v3] pxa: patches for v2.6.38-rc

[Russell King - ARM Linux]

On Fri, Jan 14, 2011 at 07:26:39PM -0600, Eric Miao wrote:
> On Fri, Jan 14, 2011 at 3:49 PM, Russell King - ARM Linux
> <linux@arm.linux.org.uk> wrote:
> > On Fri, Jan 14, 2011 at 05:31:47PM +0000, Russell King - ARM Linux wrote:
> >> On Fri, Jan 14, 2011 at 11:08:59AM -0600, Eric Miao wrote:
> >> > Hi Russell,
> >> >
> >> > I rebased the branch on top of devel-stable. The conflict in irq.c is
> >> > fixed. And there is a one-liner patch fixing a building issue in spitz.c
> >> > missing of physmap.h. Please re-pull and let know any other issue.
> >>
> >> Pulled cleanly, thanks.
> >
> > Building my PXA config:
> >
> > arch/arm/mach-pxa/irq.c:124: warning: initialization from incompatible pointer type
> > arch/arm/mach-pxa/irq.c:125: warning: initialization from incompatible pointer type
> > arch/arm/mach-pxa/irq.c:126: warning: initialization from incompatible pointer type
> > arch/arm/mach-pxa/irq.c:127: warning: initialization from incompatible pointer type
> >
> > Seems the initializers want to be .irq_ack rather than .ack etc.
> 
> You are right. Do you want me to have another patch on top or I
> make the change back into the guilty commit and you re-pull? I'd
> prefer the latter.

I dropped your tree so you can fix them locally.

[GIT PULL v3] pxa: patches for v2.6.38-rc

[Eric Miao]

On Fri, Jan 14, 2011 at 3:49 PM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Fri, Jan 14, 2011 at 05:31:47PM +0000, Russell King - ARM Linux wrote:
>> On Fri, Jan 14, 2011 at 11:08:59AM -0600, Eric Miao wrote:
>> > Hi Russell,
>> >
>> > I rebased the branch on top of devel-stable. The conflict in irq.c is
>> > fixed. And there is a one-liner patch fixing a building issue in spitz.c
>> > missing of physmap.h. Please re-pull and let know any other issue.
>>
>> Pulled cleanly, thanks.
>
> Building my PXA config:
>
> arch/arm/mach-pxa/irq.c:124: warning: initialization from incompatible pointer type
> arch/arm/mach-pxa/irq.c:125: warning: initialization from incompatible pointer type
> arch/arm/mach-pxa/irq.c:126: warning: initialization from incompatible pointer type
> arch/arm/mach-pxa/irq.c:127: warning: initialization from incompatible pointer type
>
> Seems the initializers want to be .irq_ack rather than .ack etc.
>

Fixed.

> I also need to remove asm/pgtable.h from arch/arm/mach-pxa/generic.c:
> ?CC ? ? ?arch/arm/mach-pxa/generic.o
> In file included from arch/arm/include/asm/pgtable.h:461,
> ? ? ? ? ? ? ? ? from arch/arm/mach-pxa/generic.c:26:
> include/asm-generic/pgtable.h: In function ?ptep_test_and_clear_young?:
> include/asm-generic/pgtable.h:29: error: dereferencing pointer to incomplete type
>

This didn't happen on my side. Maybe it's due to some change
not yet merged into devel-stable?

> and I also got:
> arch/arm/mach-pxa/tosa-bt.c: In function ?tosa_bt_probe?:
> arch/arm/mach-pxa/tosa-bt.c:84: error: implicit declaration of function ?rfkill_set_led_trigger_name?
>

This is going to be tricky now. The rfkill_set_led_trigger_name() has been
removed somehow as dead code along with several others in commit 2e48928,
apparently the patch author didn't notice it's existing usage, not only in
tosa-bt.c but arch/arm/mach-s3c2410/h1940-bluetooth.c.

There are two options:

1) remove the invocation completely, and rfkill_register() will just use
the dev_name(), which is of form 'rfkill%u', as the name for the led trigger.
But this is going to change the name of user space as well, which is what
we want to avoid.

2) or revert that 'removing dead code' commit. The function is simple
enough though, but since 'struct rfkill' is declared somehow within the
net/rfkill/core.c file, there has to be some function to initialize that.

Now, my personal preference would be to postpone the proper fix for this
issue into -rc?.

> which looks like a missing dependency.
>
> Do you want to fix these and send an updated pull?
>

With the first issue solved, I've pushed the change to my tree. Please
try re-pull. Will have to be on the flight hours later, and I might be
not responsive until a bit later. Sorry for this.

[GIT PULL v3] pxa: patches for v2.6.38-rc

[Russell King - ARM Linux]

On Sat, Jan 15, 2011 at 06:20:06AM -0600, Eric Miao wrote:
> > I also need to remove asm/pgtable.h from arch/arm/mach-pxa/generic.c:
> > ?CC ? ? ?arch/arm/mach-pxa/generic.o
> > In file included from arch/arm/include/asm/pgtable.h:461,
> > ? ? ? ? ? ? ? ? from arch/arm/mach-pxa/generic.c:26:
> > include/asm-generic/pgtable.h: In function ?ptep_test_and_clear_young?:
> > include/asm-generic/pgtable.h:29: error: dereferencing pointer to incomplete type
> >
> 
> This didn't happen on my side. Maybe it's due to some change
> not yet merged into devel-stable?

I sent a follow-up patch to it - see "[PATCH] Fix latest regression - pgtable.h"

> > and I also got:
> > arch/arm/mach-pxa/tosa-bt.c: In function ?tosa_bt_probe?:
> > arch/arm/mach-pxa/tosa-bt.c:84: error: implicit declaration of function ?rfkill_set_led_trigger_name?
> >
> 
> This is going to be tricky now. The rfkill_set_led_trigger_name() has been
> removed somehow as dead code along with several others in commit 2e48928,
> apparently the patch author didn't notice it's existing usage, not only in
> tosa-bt.c but arch/arm/mach-s3c2410/h1940-bluetooth.c.
> 
> There are two options:
> 
> 1) remove the invocation completely, and rfkill_register() will just use
> the dev_name(), which is of form 'rfkill%u', as the name for the led trigger.
> But this is going to change the name of user space as well, which is what
> we want to avoid.
> 
> 2) or revert that 'removing dead code' commit. The function is simple
> enough though, but since 'struct rfkill' is declared somehow within the
> net/rfkill/core.c file, there has to be some function to initialize that.
> 
> Now, my personal preference would be to postpone the proper fix for this
> issue into -rc?.

Okay, let's defer this until it can be discussed with Stephen Hemminger.