[GIT PULL] [v3.3] fixes for arch-pxa in arm

[GIT PULL] [v3.3] fixes for arch-pxa in arm

[Haojian Zhuang]

Hi Arnd,

Here's the fixes for 3.3.

The following changes since commit c38e23456278e967f094b08247ffc3711b1029b2:

  i387: fix sense of sanity check (2012-02-15 08:05:18 -0800)

are available in the git repository at:
  git://github.com/hzhuang1/linux.git fixes

Axel Lin (2):
      ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probe
      pxa/hx4700: add platform device and I2C info for AK4641 codec

Danny Kukawka (3):
      ARM: pxa: fix including linux/gpio.h twice
      arch/arm/mach-mmp/: some files include some headers twice
      arch/arm/mach-pxa/: included linux/gpio.h twice

Haojian Zhuang (2):
      ARM: pxa: fix wrong parsing gpio event on spitz
      ARM: pxa: fix mixed declarations and code in sharpsl_pm

 arch/arm/mach-mmp/aspenite.c   |    1 -
 arch/arm/mach-mmp/pxa168.c     |    1 -
 arch/arm/mach-mmp/tavorevb.c   |    1 -
 arch/arm/mach-pxa/hx4700.c     |   25 +++++++++++++++++++++++++
 arch/arm/mach-pxa/pxa25x.c     |    1 -
 arch/arm/mach-pxa/pxa27x.c     |    1 -
 arch/arm/mach-pxa/saarb.c      |    1 -
 arch/arm/mach-pxa/sharpsl_pm.c |    3 +--
 arch/arm/mach-pxa/spitz_pm.c   |    5 ++---
 drivers/pcmcia/pxa2xx_base.c   |   12 +++---------
 10 files changed, 31 insertions(+), 20 deletions(-)

[GIT PULL] [v3.3] fixes for arch-pxa in arm

[Arnd Bergmann]

On Tuesday 21 February 2012, Haojian Zhuang wrote:
> On Sat, Feb 18, 2012 at 6:04 PM, Haojian Zhuang
> <haojian.zhuang@gmail.com> wrote:
> > Hi Arnd,
> >
> > Here's the fixes for 3.3.
> >
> > The following changes since commit c38e23456278e967f094b08247ffc3711b1029b2:
> >
> >  i387: fix sense of sanity check (2012-02-15 08:05:18 -0800)
> >
> > are available in the git repository at:
> >  git://github.com/hzhuang1/linux.git fixes
> >
> > Axel Lin (2):
> >      ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probe
> >      pxa/hx4700: add platform device and I2C info for AK4641 codec
> >
> > Danny Kukawka (3):
> >      ARM: pxa: fix including linux/gpio.h twice
> >      arch/arm/mach-mmp/: some files include some headers twice
> >      arch/arm/mach-pxa/: included linux/gpio.h twice
> >
> > Haojian Zhuang (2):
> >      ARM: pxa: fix wrong parsing gpio event on spitz
> >      ARM: pxa: fix mixed declarations and code in sharpsl_pm

Hi Haojian,

I've had a look now, sorry for the late reply.

How urgent is "pxa/hx4700: add platform device and I2C info
for AK4641 codec" amongst these? If not so urgent, I would prefer
putting this one on next/fixes-non-critical or even next/board
for 3.4 while applying the reset on the fixes branch for 3.3.

I'd prefer to cut down on non-trivial fixes for 3.3 now that
we are at -rc4.

	Arnd

[GIT PULL] [v3.3] fixes for arch-pxa in arm

[Axel Lin]

Hi Arnd,

2012/2/22 Arnd Bergmann <arnd@arndb.de>:
> On Tuesday 21 February 2012, Haojian Zhuang wrote:
>> On Sat, Feb 18, 2012 at 6:04 PM, Haojian Zhuang
>> <haojian.zhuang@gmail.com> wrote:
>> > Hi Arnd,
>> >
>> > Here's the fixes for 3.3.
>> >
>> > The following changes since commit c38e23456278e967f094b08247ffc3711b1029b2:
>> >
>> > ?i387: fix sense of sanity check (2012-02-15 08:05:18 -0800)
>> >
>> > are available in the git repository at:
>> > ?git://github.com/hzhuang1/linux.git fixes
>> >
>> > Axel Lin (2):
>> > ? ? ?ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probe
>> > ? ? ?pxa/hx4700: add platform device and I2C info for AK4641 codec
>> >
>> > Danny Kukawka (3):
>> > ? ? ?ARM: pxa: fix including linux/gpio.h twice
>> > ? ? ?arch/arm/mach-mmp/: some files include some headers twice
>> > ? ? ?arch/arm/mach-pxa/: included linux/gpio.h twice
>> >
>> > Haojian Zhuang (2):
>> > ? ? ?ARM: pxa: fix wrong parsing gpio event on spitz
>> > ? ? ?ARM: pxa: fix mixed declarations and code in sharpsl_pm
>
> Hi Haojian,
>
> I've had a look now, sorry for the late reply.
>
> How urgent is "pxa/hx4700: add platform device and I2C info
> for AK4641 codec" amongst these? If not so urgent, I would prefer
> putting this one on next/fixes-non-critical or even next/board
> for 3.4 while applying the reset on the fixes branch for 3.3.

This patch is required since commit c26f64
"ASoC: add iPAQ hx4700 machine driver.
The audio on hx4700 does not work without this patch.

Actually, I think this patch should have CC stable tag for 3.0+.

I was expet to see this patch in 3.2 since I sent the patch.
I really hope it can be upstream in 3.3 now.

Thanks,
Axel

>
> I'd prefer to cut down on non-trivial fixes for 3.3 now that
> we are at -rc4.
>
> ? ? ? ?Arnd

[GIT PULL] [v3.3] fixes for arch-pxa in arm

[Arnd Bergmann]

On Tuesday 21 February 2012, Axel Lin wrote:
> 2012/2/22 Arnd Bergmann <arnd@arndb.de>:
> > How urgent is "pxa/hx4700: add platform device and I2C info
> > for AK4641 codec" amongst these? If not so urgent, I would prefer
> > putting this one on next/fixes-non-critical or even next/board
> > for 3.4 while applying the reset on the fixes branch for 3.3.
> 
> This patch is required since commit c26f64
> "ASoC: add iPAQ hx4700 machine driver.
> The audio on hx4700 does not work without this patch.
> 
> Actually, I think this patch should have CC stable tag for 3.0+.
> 
> I was expet to see this patch in 3.2 since I sent the patch.
> I really hope it can be upstream in 3.3 now.

Hi Axel,

I still wouldn't consider the patch a bug fix, but it's clear that
this is needed and we should have merged it much earlier.

I've merged the entire series into the fixes branch now, but in the
future I want to see patches like this separate from bug fixes
and only in the merge window.

	Arnd