| Message ID | 52A823E4.6070208@gmail.com |
|---|---|
| State | New |
| Headers | show |
Hi, On Wed, Dec 11, 2013 at 04:35:48PM +0800, Haojian Zhuang wrote: > 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 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. > > 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?! > > Michael Opdenacker (1): > ARM: pxa: remove IRQF_DISABLED A cleanup, goes into next/cleanup. > > 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). > PXA: add PWM nodes to pxa27x.dtsi I'll add this to next/dt. Fixed up the patch subject to be ARM: pxa though > > Sergei Ianovich (1): > ARM: pxa: prevent PXA270 occasional reboot freezes fixes for 3.13. I'll also mark it for stable. > Thierry Reding (1): > ARM: pxa: Remove unused variables Added into next/cleanup. -Olof
On Wed, Dec 11, 2013 at 04:35:48PM +0800, Haojian Zhuang wrote: > 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 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
On 12/12/2013 08:42 AM, Olof Johansson wrote: > Hi, > > On Wed, Dec 11, 2013 at 04:35:48PM +0800, Haojian Zhuang wrote: >> 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 > > 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. > >> >> 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?! > This commit exists from v2.6.34. >> >> 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
On 12/12/2013 09:29 AM, Olof Johansson wrote: > On Wed, Dec 11, 2013 at 04:35:48PM +0800, Haojian Zhuang wrote: >> 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 > > 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 > I'm sorry on this. I'll be careful in the future. Best Regards Haojian
On 12/12/2013 03:11 AM, Haojian Zhuang wrote: > On 12/12/2013 09:29 AM, Olof Johansson wrote: >> >>> >>> 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 >> > > 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.
On Thu, Dec 12, 2013 at 10:08:38AM +0800, Haojian Zhuang wrote: > On 12/12/2013 08:42 AM, Olof Johansson wrote: > > On Wed, Dec 11, 2013 at 04:35:48PM +0800, Haojian Zhuang wrote: [...] > > >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
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