Skip to contentSkip to conversation

pull request from pxa

GIT PULL Haojian Zhuang 4 participants 7 messages Dec 11, 2013 – Dec 12, 2013

lore
Share & tools
lore

Haojian Zhuang

author
#0 lore raw

Hi Arnd/Olof/Kevin,

Please help to merge the pull request for pxa.

Best Regards
Haojian

The following changes since commit 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae:

Linux 3.13-rc1 (2013-11-22 11:30:55 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux.git
tags/pxa-for-3.14

for you to fetch changes up to 8a53a1194f1cc870de0ab9db1728b1ecab770925:

ARM: pxa: remove IRQF_DISABLED (2013-12-11 15:36:24 +0800)

----------------------------------------------------------------
Dmitry Eremin-Solenikov (1):
arm: pxa: tosa: fix keys mapping

Michael Opdenacker (1):
ARM: pxa: remove IRQF_DISABLED

Mike Dunn (2):
PWM: PXA: add device tree support to PWM driver
PXA: add PWM nodes to pxa27x.dtsi

Sergei Ianovich (1):
ARM: pxa: prevent PXA270 occasional reboot freezes

Thierry Reding (1):
ARM: pxa: Remove unused variables

  Documentation/devicetree/bindings/pwm/pxa-pwm.txt |  30 
+++++++++++++++++++++++++++
  arch/arm/boot/dts/pxa27x.dtsi                     |  24 
++++++++++++++++++++++
  arch/arm/mach-pxa/am200epd.c                      |   3 +--
  arch/arm/mach-pxa/am300epd.c                      |   3 +--
  arch/arm/mach-pxa/em-x270.c                       |   3 +--
  arch/arm/mach-pxa/irq.c                           |   4 ----
  arch/arm/mach-pxa/magician.c                      |   2 +-
  arch/arm/mach-pxa/mainstone.c                     |   2 +-
  arch/arm/mach-pxa/pcm990-baseboard.c              |   2 +-
  arch/arm/mach-pxa/reset.c                         |   8 +++++++-
  arch/arm/mach-pxa/sharpsl_pm.c                    |   8 ++++----
  arch/arm/mach-pxa/time.c                          |   2 +-
  arch/arm/mach-pxa/tosa.c                          | 102 
++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------
  arch/arm/mach-pxa/trizeps4.c                      |   3 +--
  arch/arm/plat-pxa/dma.c                           |   2 +-
  drivers/pwm/pwm-pxa.c                             |  52 
++++++++++++++++++++++++++++++++++++++++++++++-
  16 files changed, 176 insertions(+), 74 deletions(-)

create mode 100644 Documentation/devicetree/bindings/pwm/pxa-pwm.txt

#1 lore raw

Hi,

Quoted 8 lines · Haojian Zhuang

Hi Arnd/Olof/Kevin,

Please help to merge the pull request for pxa.

Best Regards
Haojian

Quoted 8 lines

The following changes since commit 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae:

Linux 3.13-rc1 (2013-11-22 11:30:55 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux.git
tags/pxa-for-3.14

These patches are a bit all over the place. I'll take some of them and cherry-pick them instead of merging the branch as it is. Since your tree is not in linux-next, that shouldn't cause any problems.

Quoted 8 lines

for you to fetch changes up to 8a53a1194f1cc870de0ab9db1728b1ecab770925:

ARM: pxa: remove IRQF_DISABLED (2013-12-11 15:36:24 +0800)

----------------------------------------------------------------
Dmitry Eremin-Solenikov (1):
arm: pxa: tosa: fix keys mapping

Ok, that's a fix. Applying to fixes for 3.13 and marking for stable.

Also, please start referring to which commit introduced the breakage, to make it easier for people to tell if they need the fix or not. Looks like it's been broken since 2010?!

Quoted 3 lines

Michael Opdenacker (1):
ARM: pxa: remove IRQF_DISABLED

A cleanup, goes into next/cleanup.

Quoted 3 lines

Mike Dunn (2):
PWM: PXA: add device tree support to PWM driver

This patch should go to the PWM maintainer, not to us. Or at least be acked by them (but it might as well be merged since there are no dependencies).

Quoted 1 line

PXA: add PWM nodes to pxa27x.dtsi

I'll add this to next/dt. Fixed up the patch subject to be ARM: pxa though

Quoted 3 lines

Sergei Ianovich (1):
ARM: pxa: prevent PXA270 occasional reboot freezes

fixes for 3.13. I'll also mark it for stable.

Quoted 2 lines

Thierry Reding (1):
ARM: pxa: Remove unused variables

Added into next/cleanup.

-Olof

author
#2 lore raw
Quoted 33 lines · Olof Johansson

Hi,

Quoted 8 lines · Haojian Zhuang

Hi Arnd/Olof/Kevin,

Please help to merge the pull request for pxa.

Best Regards
Haojian

Quoted 8 lines

The following changes since commit 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae:

   Linux 3.13-rc1 (2013-11-22 11:30:55 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux.git
tags/pxa-for-3.14

These patches are a bit all over the place. I'll take some of them and cherry-pick them instead of merging the branch as it is. Since your tree is not in linux-next, that shouldn't cause any problems.

Quoted 8 lines

for you to fetch changes up to 8a53a1194f1cc870de0ab9db1728b1ecab770925:

   ARM: pxa: remove IRQF_DISABLED (2013-12-11 15:36:24 +0800)

----------------------------------------------------------------
Dmitry Eremin-Solenikov (1):
arm: pxa: tosa: fix keys mapping

Quoted 6 lines

Ok, that's a fix. Applying to fixes for 3.13 and marking for stable.

Also, please start referring to which commit introduced the breakage, to make it easier for people to tell if they need the fix or not. Looks like it's been broken since 2010?!

This commit exists from v2.6.34.

Quoted 6 lines
Quoted 3 lines

Mike Dunn (2):
PWM: PXA: add device tree support to PWM driver

This patch should go to the PWM maintainer, not to us. Or at least be acked by them (but it might as well be merged since there are no dependencies).

Thierry,

I remember that you ask this patch to be merged into armsoc. Please give an Ack. Then I could resend the pull request.

Best Regards
Haojian

#3 lore raw
Quoted 2 lines · Haojian Zhuang
Quoted 1 line · Olof Johansson

On Wed, Dec 11, 2013 at 04:35:48PM +0800, Haojian Zhuang wrote:

[...]

Quoted 10 lines
Quoted 5 lines
Quoted 2 lines

Mike Dunn (2):
PWM: PXA: add device tree support to PWM driver

This patch should go to the PWM maintainer, not to us. Or at least be acked by them (but it might as well be merged since there are no dependencies).

Thierry,

I remember that you ask this patch to be merged into armsoc. Please give an Ack. Then I could resend the pull request.

I think what I said was to merge patch 2/2 (the DTS changes) via arm-soc but not the PWM driver changes. As a matter of fact I've already applied Mike's patch to my for-next branch.

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131212/ed031673/attachment-0001.sig>

#4 lore raw
In reply to Haojian Zhuang
Quoted 19 lines · Haojian Zhuang

Hi Arnd/Olof/Kevin,

Please help to merge the pull request for pxa.

Best Regards
Haojian

The following changes since commit 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae:

Linux 3.13-rc1 (2013-11-22 11:30:55 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux.git
tags/pxa-for-3.14

for you to fetch changes up to 8a53a1194f1cc870de0ab9db1728b1ecab770925:

Quoted 8 lines

ARM: pxa: remove IRQF_DISABLED (2013-12-11 15:36:24 +0800)

----------------------------------------------------------------
Dmitry Eremin-Solenikov (1):
arm: pxa: tosa: fix keys mapping

Michael Opdenacker (1):
ARM: pxa: remove IRQF_DISABLED

This patch doesn't even build:

arch/arm/mach-pxa/pcm990-baseboard.c:331:9: error: too few arguments to function 'request_irq'

Why the !@%@# are you sending me code for your platform that you didn't even bother building to check for errors?

I've fixed it up, but you really have to do better than this.

-Olof

author
#5 lore raw
Quoted 34 lines · Olof Johansson
Quoted 19 lines · Haojian Zhuang

Hi Arnd/Olof/Kevin,

Please help to merge the pull request for pxa.

Best Regards
Haojian

The following changes since commit 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae:

   Linux 3.13-rc1 (2013-11-22 11:30:55 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux.git
tags/pxa-for-3.14

for you to fetch changes up to 8a53a1194f1cc870de0ab9db1728b1ecab770925:

Quoted 8 lines
   ARM: pxa: remove IRQF_DISABLED (2013-12-11 15:36:24 +0800)

----------------------------------------------------------------
Dmitry Eremin-Solenikov (1):
arm: pxa: tosa: fix keys mapping

Michael Opdenacker (1):
ARM: pxa: remove IRQF_DISABLED

This patch doesn't even build:

arch/arm/mach-pxa/pcm990-baseboard.c:331:9: error: too few arguments to function 'request_irq'

Quoted 8 lines

Why the !@%@# are you sending me code for your platform that you didn't even bother building to check for errors?

I've fixed it up, but you really have to do better than this.

-Olof

I'm sorry on this. I'll be careful in the future.

Best Regards
Haojian

#6 lore raw
Quoted 17 lines · Haojian Zhuang
Quoted 16 lines · Olof Johansson
Quoted 4 lines

Michael Opdenacker (1):
ARM: pxa: remove IRQF_DISABLED

This patch doesn't even build:

arch/arm/mach-pxa/pcm990-baseboard.c:331:9: error: too few arguments to function 'request_irq'

Why the !@%@# are you sending me code for your platform that you didn't even bother building to check for errors?

I've fixed it up, but you really have to do better than this.

Quoted 7 lines
Quoted 2 lines

-Olof

I'm sorry on this. I'll be careful in the future.

Best Regards
Haojian

That's *my* fault. This patch was rather trivial and at that's why I was confident it didn't need testing. However, I messed up on that particular line.

My apologies!!! I'll be extra careful next time.

Michael.

Signature · 4 lines
Michael Opdenacker, CEO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
+33 484 258 098