* [GIT PULL] pxa changes for v3.3
@ 2011-12-08 7:22 Haojian Zhuang
2011-12-08 12:06 ` Eric Miao
2011-12-09 14:23 ` Arnd Bergmann
0 siblings, 2 replies; 4+ messages in thread
From: Haojian Zhuang @ 2011-12-08 7:22 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd,
Please pull these for v3.3.
The four patches in below are used to fix build issue while gpio-pxa
is changed to platform driver.
pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()
Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()
ARM: pxa: fix build error for GPIO_bit()
ARM: pxa: fix the build error because of missing gpio-pxa.h
The following changes since commit 1fc27d6c81c881a67fcd1ff983f23c06cdd2a93f:
Merge branch 'fixes' into for-next (2011-12-06 14:24:24 +0000)
are available in the git repository at:
git://github.com/hzhuang1/linux.git for-next
Axel Lin (2):
pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()
Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()
Haojian Zhuang (2):
ARM: pxa: fix build error for GPIO_bit()
ARM: pxa: fix the build error because of missing gpio-pxa.h
Jett.Zhou (5):
RTC: sa1100: Clean out ost register
RTC: sa1100: remove redundant code of setting alarm
RTC: sa1100: support sa1100, pxa and mmp soc families
ARM: pxa: add dummy clock for sa1100-rtc
ARM: sa1100: clean up of the clock support
arch/arm/Kconfig | 2 +-
arch/arm/mach-pxa/corgi_pm.c | 1 +
arch/arm/mach-pxa/devices.c | 20 ++
arch/arm/mach-pxa/pxa25x.c | 1 +
arch/arm/mach-pxa/pxa27x.c | 1 +
arch/arm/mach-pxa/pxa300.c | 1 +
arch/arm/mach-pxa/pxa320.c | 1 +
arch/arm/mach-pxa/pxa3xx.c | 1 +
arch/arm/mach-pxa/pxa95x.c | 1 +
arch/arm/mach-pxa/spitz_pm.c | 1 +
arch/arm/mach-sa1100/clock.c | 91 ++++++---
arch/arm/mach-sa1100/generic.c | 20 ++
drivers/input/touchscreen/zylonite-wm97xx.c | 5 +-
drivers/pcmcia/pxa2xx_e740.c | 11 +-
drivers/pcmcia/pxa2xx_palmld.c | 2 +-
drivers/pcmcia/pxa2xx_palmtc.c | 2 +-
drivers/pcmcia/pxa2xx_stargate2.c | 6 +-
drivers/pcmcia/pxa2xx_trizeps4.c | 5 +-
drivers/pcmcia/pxa2xx_vpac270.c | 4 +-
drivers/rtc/Kconfig | 2 +-
drivers/rtc/rtc-sa1100.c | 300 ++++++++++++++++-----------
21 files changed, 320 insertions(+), 158 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [GIT PULL] pxa changes for v3.3
2011-12-08 7:22 [GIT PULL] pxa changes for v3.3 Haojian Zhuang
@ 2011-12-08 12:06 ` Eric Miao
2011-12-09 14:23 ` Arnd Bergmann
1 sibling, 0 replies; 4+ messages in thread
From: Eric Miao @ 2011-12-08 12:06 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Dec 8, 2011 at 3:22 PM, Haojian Zhuang <haojian.zhuang@gmail.com> wrote:
> Hi Arnd,
>
> Please pull these for v3.3.
>
> The four patches in below are used to fix build issue while gpio-pxa
> is changed to platform driver.
> ? ? ?pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()
> ? ? ?Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()
> ? ? ?ARM: pxa: fix build error for GPIO_bit()
> ? ? ?ARM: pxa: fix the build error because of missing gpio-pxa.h
Thanks Haojian. Looks fine to me.
>
>
> The following changes since commit 1fc27d6c81c881a67fcd1ff983f23c06cdd2a93f:
>
> ?Merge branch 'fixes' into for-next (2011-12-06 14:24:24 +0000)
>
> are available in the git repository at:
>
> ?git://github.com/hzhuang1/linux.git for-next
>
> Axel Lin (2):
> ? ? ?pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()
> ? ? ?Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()
>
> Haojian Zhuang (2):
> ? ? ?ARM: pxa: fix build error for GPIO_bit()
> ? ? ?ARM: pxa: fix the build error because of missing gpio-pxa.h
>
> Jett.Zhou (5):
> ? ? ?RTC: sa1100: Clean out ost register
> ? ? ?RTC: sa1100: remove redundant code of setting alarm
> ? ? ?RTC: sa1100: support sa1100, pxa and mmp soc families
> ? ? ?ARM: pxa: add dummy clock for sa1100-rtc
> ? ? ?ARM: sa1100: clean up of the clock support
>
> ?arch/arm/Kconfig ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?2 +-
> ?arch/arm/mach-pxa/corgi_pm.c ? ? ? ? ? ? ? ?| ? ?1 +
> ?arch/arm/mach-pxa/devices.c ? ? ? ? ? ? ? ? | ? 20 ++
> ?arch/arm/mach-pxa/pxa25x.c ? ? ? ? ? ? ? ? ?| ? ?1 +
> ?arch/arm/mach-pxa/pxa27x.c ? ? ? ? ? ? ? ? ?| ? ?1 +
> ?arch/arm/mach-pxa/pxa300.c ? ? ? ? ? ? ? ? ?| ? ?1 +
> ?arch/arm/mach-pxa/pxa320.c ? ? ? ? ? ? ? ? ?| ? ?1 +
> ?arch/arm/mach-pxa/pxa3xx.c ? ? ? ? ? ? ? ? ?| ? ?1 +
> ?arch/arm/mach-pxa/pxa95x.c ? ? ? ? ? ? ? ? ?| ? ?1 +
> ?arch/arm/mach-pxa/spitz_pm.c ? ? ? ? ? ? ? ?| ? ?1 +
> ?arch/arm/mach-sa1100/clock.c ? ? ? ? ? ? ? ?| ? 91 ++++++---
> ?arch/arm/mach-sa1100/generic.c ? ? ? ? ? ? ?| ? 20 ++
> ?drivers/input/touchscreen/zylonite-wm97xx.c | ? ?5 +-
> ?drivers/pcmcia/pxa2xx_e740.c ? ? ? ? ? ? ? ?| ? 11 +-
> ?drivers/pcmcia/pxa2xx_palmld.c ? ? ? ? ? ? ?| ? ?2 +-
> ?drivers/pcmcia/pxa2xx_palmtc.c ? ? ? ? ? ? ?| ? ?2 +-
> ?drivers/pcmcia/pxa2xx_stargate2.c ? ? ? ? ? | ? ?6 +-
> ?drivers/pcmcia/pxa2xx_trizeps4.c ? ? ? ? ? ?| ? ?5 +-
> ?drivers/pcmcia/pxa2xx_vpac270.c ? ? ? ? ? ? | ? ?4 +-
> ?drivers/rtc/Kconfig ? ? ? ? ? ? ? ? ? ? ? ? | ? ?2 +-
> ?drivers/rtc/rtc-sa1100.c ? ? ? ? ? ? ? ? ? ?| ?300 ++++++++++++++++-----------
> ?21 files changed, 320 insertions(+), 158 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [GIT PULL] pxa changes for v3.3
2011-12-08 7:22 [GIT PULL] pxa changes for v3.3 Haojian Zhuang
2011-12-08 12:06 ` Eric Miao
@ 2011-12-09 14:23 ` Arnd Bergmann
1 sibling, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2011-12-09 14:23 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday 08 December 2011, Haojian Zhuang wrote:
> Please pull these for v3.3.
>
> The four patches in below are used to fix build issue while gpio-pxa
> is changed to platform driver.
> pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()
> Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()
> ARM: pxa: fix build error for GPIO_bit()
> ARM: pxa: fix the build error because of missing gpio-pxa.h
>
>
> The following changes since commit 1fc27d6c81c881a67fcd1ff983f23c06cdd2a93f:
>
> Merge branch 'fixes' into for-next (2011-12-06 14:24:24 +0000)
>
> are available in the git repository at:
>
> git://github.com/hzhuang1/linux.git for-next
>
Sorry, I can't pull these. As I explained to other people before, you cannot
base your submissions on the for-next branch because that is not kept stable.
The patches in here all look ok, so just rebase these onto 3.2-rc4.
Also, please keep the bug fixes separate from features so I can send
the fixes early (ideally for 3.2) while I queue up the other patches
for 3.3. See my "subarch maintainers: please send 3.3 pull requests for
arm-soc" for the other instructions.
Arnd
^ permalink raw reply [flat|nested] 4+ messages in thread
* [GIT PULL] pxa changes for v3.3
@ 2011-12-13 10:01 Haojian Zhuang
0 siblings, 0 replies; 4+ messages in thread
From: Haojian Zhuang @ 2011-12-13 10:01 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd,
Please pull these for v3.3. I rebased those patches on Linux 3.2-rc5.
The following changes since commit dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50:
Linux 3.2-rc5 (2011-12-09 15:09:32 -0800)
are available in the git repository at:
git://github.com/hzhuang1/linux.git for-next
Axel Lin (2):
pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()
Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()
Haojian Zhuang (3):
ARM: pxa: fix build error for GPIO_bit()
ARM: pxa: fix the build error because of missing gpio-pxa.h
MAINTAINERS: update pxa and mmp
Jett.Zhou (5):
RTC: sa1100: Clean out ost register
RTC: sa1100: remove redundant code of setting alarm
RTC: sa1100: support sa1100, pxa and mmp soc families
ARM: pxa: add dummy clock for sa1100-rtc
ARM: sa1100: clean up of the clock support
MAINTAINERS | 22 +--
arch/arm/Kconfig | 2 +-
arch/arm/mach-pxa/corgi_pm.c | 1 +
arch/arm/mach-pxa/devices.c | 20 ++
arch/arm/mach-pxa/pxa25x.c | 2 +
arch/arm/mach-pxa/pxa27x.c | 2 +
arch/arm/mach-pxa/pxa300.c | 1 +
arch/arm/mach-pxa/pxa320.c | 1 +
arch/arm/mach-pxa/pxa3xx.c | 1 +
arch/arm/mach-pxa/pxa95x.c | 1 +
arch/arm/mach-pxa/spitz_pm.c | 1 +
arch/arm/mach-sa1100/clock.c | 91 ++++++---
arch/arm/mach-sa1100/generic.c | 20 ++
drivers/input/touchscreen/zylonite-wm97xx.c | 5 +-
drivers/pcmcia/pxa2xx_e740.c | 11 +-
drivers/pcmcia/pxa2xx_palmld.c | 2 +-
drivers/pcmcia/pxa2xx_palmtc.c | 2 +-
drivers/pcmcia/pxa2xx_stargate2.c | 6 +-
drivers/pcmcia/pxa2xx_trizeps4.c | 5 +-
drivers/pcmcia/pxa2xx_vpac270.c | 4 +-
drivers/rtc/Kconfig | 2 +-
drivers/rtc/rtc-sa1100.c | 300 ++++++++++++++++-----------
22 files changed, 329 insertions(+), 173 deletions(-)
Thanks
Haojian
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-12-13 10:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-08 7:22 [GIT PULL] pxa changes for v3.3 Haojian Zhuang
2011-12-08 12:06 ` Eric Miao
2011-12-09 14:23 ` Arnd Bergmann
-- strict thread matches above, loose matches on Subject: below --
2011-12-13 10:01 Haojian Zhuang
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).