* [GIT PULL] ARM: SoC fixes for 3.12-rc
@ 2013-10-25 10:21 Olof Johansson
0 siblings, 0 replies; 13+ messages in thread
From: Olof Johansson @ 2013-10-25 10:21 UTC (permalink / raw)
To: torvalds; +Cc: olof, arm, linux-arm-kernel, linux-kernel
Hi Linus,
The following changes since commit 4d594dd3028ba8cdfcbd854bde3811a1ee4e36d7:
ARM: exynos: dts: Update 5250 arch timer node with clock frequency (2013-10-13 09:33:54 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/fixes-for-linus
for you to fetch changes up to 08ddbb0a899a4e7a9214bc7c063be436cabbc52a:
MAINTAINERS: Add maintainers entry for Rockchip SoCs (2013-10-18 07:01:00 -0700)
----------------------------------------------------------------
ARM: SoC fixes for 3.12-rc
There's really only one bugfix in this branch, which is a fix for timers on
the integrator platform. Since Linus Walleij is resurrecting support for
the platform it seems valuable to get the fix into 3.12 even though the
regression has been around a while.
The rest are a handful of maintainers updates. If you prefer to hold those
until 3.13 then just merge the first patch on the branch which is the fix.
----------------------------------------------------------------
Heiko Stuebner (1):
MAINTAINERS: Add maintainers entry for Rockchip SoCs
Jason Cooper (1):
MAINTAINERS: ARM: mvebu: add Sebastian Hesselbarth
Linus Walleij (1):
ARM: integrator: deactivate timer0 on the Integrator/CP
Stephen Warren (1):
MAINTAINERS: Tegra updates, and driver ownership
MAINTAINERS | 71 ++++++++++++++++++++++++++++++++++++--
arch/arm/boot/dts/integratorcp.dts | 9 +++--
2 files changed, 73 insertions(+), 7 deletions(-)
^ permalink raw reply [flat|nested] 13+ messages in thread
* [GIT PULL] ARM: SoC fixes for 3.12-rc
@ 2013-10-13 16:43 Olof Johansson
0 siblings, 0 replies; 13+ messages in thread
From: Olof Johansson @ 2013-10-13 16:43 UTC (permalink / raw)
To: torvalds; +Cc: olof, arm, linux-arm-kernel, linux-kernel
Hi Linus,
The following changes since commit d0e639c9e06d44e713170031fe05fb60ebe680af:
Linux 3.12-rc4 (2013-10-06 14:00:20 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/fixes-for-linus
for you to fetch changes up to 4d594dd3028ba8cdfcbd854bde3811a1ee4e36d7:
ARM: exynos: dts: Update 5250 arch timer node with clock frequency (2013-10-13 09:33:54 -0700)
----------------------------------------------------------------
ARM: SoC fixes for 3.12-rc
A small batch of fixes this week, mostly OMAP related. Nothing stands out
as particularly controversial.
Also a fix for a 3.12-rc1 timer regression for Exynos platforms, including
the Chromebooks.
----------------------------------------------------------------
Aaro Koskinen (1):
ARM: OMAP2: gpmc-onenand: fix sync mode setup with DT
Nishanth Menon (1):
ARM: OMAP3: Fix hardware detection for omap3630 when booted with device tree
Olof Johansson (1):
Merge tag 'fixes-against-v3.12-rc3-take2' of git://git.kernel.org/.../tmlind/linux-omap into fixes
Pali Rohár (1):
ARM: OMAP2: RX-51: Add missing max_current to rx51_lp5523_led_config
Simon Barth (1):
ARM: mach-omap2: board-generic: fix undefined symbol
Tony Lindgren (1):
ARM: dts: Fix pinctrl mask for omap3
Yuvaraj Kumar C D (1):
ARM: exynos: dts: Update 5250 arch timer node with clock frequency
arch/arm/boot/dts/exynos5250.dtsi | 5 +++++
arch/arm/boot/dts/omap3-beagle-xm.dts | 2 +-
arch/arm/boot/dts/omap3.dtsi | 4 ++--
arch/arm/mach-omap2/board-generic.c | 18 ++++++++++++++++++
arch/arm/mach-omap2/board-rx51-peripherals.c | 9 +++++++++
arch/arm/mach-omap2/gpmc-onenand.c | 12 +++++++++++-
arch/arm/mach-omap2/mux.h | 4 +---
arch/arm/mach-omap2/timer.c | 4 ++--
include/dt-bindings/pinctrl/omap.h | 4 +---
9 files changed, 50 insertions(+), 12 deletions(-)
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] ARM: SoC fixes for 3.12-rc
2013-09-19 23:19 ` Woodhouse, David
2013-09-20 0:44 ` Brian Norris
@ 2013-10-03 5:02 ` Brian Norris
1 sibling, 0 replies; 13+ messages in thread
From: Brian Norris @ 2013-10-03 5:02 UTC (permalink / raw)
To: Woodhouse, David; +Cc: linux-kernel, linux-mtd, Artem Bityutskiy
(Trimming CC list)
Hi David,
On Thu, Sep 19, 2013 at 4:19 PM, Woodhouse, David
<david.woodhouse@intel.com> wrote:
> On Thu, 2013-09-19 at 15:57 -0700, Brian Norris wrote:
>> Speaking of such process issues: there's an outstanding patch for a
>> (small) memory leak that was introduced in the nand_base.c ONFI code
>> in 3.12-rc1. Can I expect you to attend to these sort of -rcX (where X
>> > 1) issues? Or should I send Linus the patch myself? I don't really
>> want it to wait around until 3.13-rc1 to go to -stable.
>
> I'm aware of it, and will get to it shortly. Was going to round it up
> along with the one that Olof just sent, either some time this week at
> Plumbers or when I get home.
I see that you have queued up some 3.12-rc patches in linux-mtd.git.
This is a reminder to send a pull request...
> If you want to stick it in the linux-mtd.git tree before that and send
> Linus a pull request, I have no objection.
...or else I will just send them myself within a week.
Thanks,
Brian
^ permalink raw reply [flat|nested] 13+ messages in thread
* [GIT PULL] ARM: SoC fixes for 3.12-rc
@ 2013-10-03 4:15 Olof Johansson
0 siblings, 0 replies; 13+ messages in thread
From: Olof Johansson @ 2013-10-03 4:15 UTC (permalink / raw)
To: torvalds; +Cc: olof, arm, linux-arm-kernel, linux-kernel
Hi Linus,
The following changes since commit 660e1c2f47f51f5b03ea7f63fa11f000e0240bda:
Merge tag 'omap-for-v3.12/fixes-dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes (2013-09-18 14:01:39 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/fixes-for-linus
for you to fetch changes up to 6a98b2ffc7cf8a84a18d8666185c29b7e0e631e9:
Merge tag 'fixes-3.12-2' of git://git.infradead.org/linux-mvebu into fixes (2013-10-02 20:55:05 -0700)
----------------------------------------------------------------
ARM: SoC fixes for 3.12-rc
We have a fairly large batch of fixes this time around, mostly just due to
various platforms all having a fix or two more than usual.
Worth pointing out are:
- A fix for EDMA on Davinci/OMAP where channel allocation broke with
the DT conversion. Due to some miscommunication we didn't
understand the impact of the breakage, so we were pushing back on it
for 3.12, but it sounds like it's actually breaking quite a few people
out there.
- A bunch of fixes for Marvell platforms, some straggling fixes for
merge window fallout and some fixes for a couple of the platforms
(Netgear RN102 in particular).
- A fix for a race between multi-cluster power management and cpu hotplug
on Versatile Express.
And a bunch of other smaller fixes that all add up.
We'll be switching over into stricter regressions-only mode from here
on out.
----------------------------------------------------------------
Andrew Lunn (1):
ARM: Kirkwood: Add missing DT reg property to cpu@0
Arnaud Ebalard (3):
ARM: mvebu: fix ReadyNAS 102 Power button GPIO to make it active high
ARM: mvebu: Add DT entry for ReadyNAS 102 to use gpio-poweroff driver
ARM: mvebu: add missing DT Mbus ranges and relocate PCIe DT nodes for RN102
Barry Song (4):
ARM: dts: makefile: build atlas6-evb.dtb for ARCH_ATLAS6
ARM: dts: sirf: fix the ranges of peri-iobrg of prima2
MAINTAINERS: ARM: SIRF: add missed drivers into maintain list
MAINTAINERS: ARM: SIRF: use kernel.org mail box
Brian Norris (1):
ARM: davinci: dm365 evm: fix unused variable warning
Ezequiel Garcia (2):
ARM: mvebu: Add the reference 25 MHz fixed-clock to Armada XP
ARM: mvebu: Add clock properties to Armada XP timer node
Guennadi Liakhovetski (1):
ARM: shmobile: update SDHI DT compatibility string to the <unit>-<soc> format
Jason Gunthorpe (1):
bus: mvebu-mbus: Fix optional pcie-mem/io-aperture properties
Jean-Christophe PLAGNIOL-VILLARD (1):
ARM: at91: sam9g45: shutdown ddr1 too when rebooting
Jiri Prchal (1):
ARM: at91: serial: fix wrong pinctrl_usart2_rts
Jisheng Zhang (2):
ARM: mvebu: add missing of_node_put() to fix reference leak
bus: mvebu: add missing of_node_put() to fix reference leak
Joel Fernandes (1):
ARM: edma: Fix clearing of unused list for DT DMA resources
Joerg Roedel (1):
ARM: mach-integrator: Add stub for pci_v3_early_init() for !CONFIG_PCI
Kuninori Morimoto (1):
ARM: shmobile: armadillo: fixup ether pinctrl naming
Laurent Pinchart (2):
gpio: rcar: Remove #gpio-range-cells DT property usage
ARM: shmobile: Remove #gpio-ranges-cells DT property
Lorenzo Pieralisi (1):
ARM: vexpress: tc2: fix hotplug/idle/kexec race on cluster power down
Michael Opdenacker (1):
ARM: at91: remove IRQF_DISABLED
Nicolas Ferre (1):
ARM: at91: at91sam9x5: set default mmc[01] pinctrl-names
Olof Johansson (6):
Merge tag 'fixes-3.12' of git://git.infradead.org/linux-mvebu into fixes
Merge tag 'davinci-fixes-for-v3.12-rc2-v2' of git://git.kernel.org/.../nsekhar/linux-davinci into fixes
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
Merge tag 'renesas-fixes4-for-v3.12' of git://git.kernel.org/.../horms/renesas into fixes
ARM: multi_v7_defconfig: add SDHCI for i.MX
Merge tag 'fixes-3.12-2' of git://git.infradead.org/linux-mvebu into fixes
Qipan Li (1):
ARM: dts: sirf: fix fifosize, clks, dma channels for UART
Quentin Armitage (1):
ARM: kirkwood: Fix address of second XOR engine
Renwei Wu (1):
ARM: dts: sirf: fix interrupt and dma prop of VIP for prima2 and atlas6
Sekhar Nori (1):
ARM: davinci: fix build breakage with DEBUG_LL
Sergei Shtylyov (1):
ARM: shmobile: Lager: add Micrel KSZ8041 PHY fixup
Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 17 ++++----
MAINTAINERS | 8 +++-
arch/arm/boot/dts/Makefile | 2 +
arch/arm/boot/dts/armada-370-netgear-rn102.dts | 49 ++++++++++++++--------
arch/arm/boot/dts/armada-xp.dtsi | 11 +++++
arch/arm/boot/dts/at91sam9x5.dtsi | 6 ++-
arch/arm/boot/dts/atlas6.dtsi | 12 ++++++
arch/arm/boot/dts/kirkwood.dtsi | 3 +-
arch/arm/boot/dts/prima2.dtsi | 27 ++++++++++--
arch/arm/boot/dts/r8a73a4.dtsi | 6 +--
arch/arm/boot/dts/r8a7778.dtsi | 1 -
arch/arm/boot/dts/r8a7779.dtsi | 1 -
arch/arm/boot/dts/r8a7790.dtsi | 9 ++--
arch/arm/boot/dts/sh73a0.dtsi | 6 +--
arch/arm/common/edma.c | 38 +++++++++++++----
arch/arm/configs/multi_v7_defconfig | 1 +
arch/arm/mach-at91/at91rm9200_time.c | 2 +-
arch/arm/mach-at91/at91sam926x_time.c | 2 +-
arch/arm/mach-at91/at91sam9g45_reset.S | 8 ++++
arch/arm/mach-at91/at91x40_time.c | 2 +-
arch/arm/mach-davinci/board-dm365-evm.c | 2 +-
arch/arm/mach-davinci/include/mach/serial.h | 4 +-
arch/arm/mach-integrator/pci_v3.h | 7 ++++
arch/arm/mach-mvebu/coherency.c | 8 +++-
arch/arm/mach-mvebu/pmsu.c | 1 +
arch/arm/mach-mvebu/system-controller.c | 1 +
arch/arm/mach-shmobile/board-armadillo800eva.c | 4 +-
arch/arm/mach-shmobile/board-lager.c | 27 +++++++++++-
arch/arm/mach-vexpress/tc2_pm.c | 11 ++++-
drivers/bus/mvebu-mbus.c | 12 ++++--
drivers/gpio/gpio-rcar.c | 7 ++--
drivers/mmc/host/sh_mobile_sdhi.c | 16 +++----
32 files changed, 233 insertions(+), 78 deletions(-)
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] ARM: SoC fixes for 3.12-rc
2013-09-27 10:59 ` Woodhouse, David
@ 2013-09-27 17:40 ` Brian Norris
0 siblings, 0 replies; 13+ messages in thread
From: Brian Norris @ 2013-09-27 17:40 UTC (permalink / raw)
To: Woodhouse, David
Cc: Olof Johansson, torvalds, arm, linux-arm-kernel, linux-kernel, linux-mtd
On Fri, Sep 27, 2013 at 3:59 AM, Woodhouse, David
<david.woodhouse@intel.com> wrote:
> On Thu, 2013-09-19 at 17:44 -0700, Brian Norris wrote:
>> > Does that m25p80 'fix 4 byte addressing' fix for Micron not also want to
>> > go in?
>>
>> I suppose the m25p80 one can go in as well. It's not so much a bugfix
>> as augmenting my original patch to support more devices. But it is
>> safe enough.
>
> You say 'support more devices', but AFAICT the code in -rc1 will already
> *attempt* to enable 4-byte addressing on those devices, and fail.
As will the code in every release since 3.7-rc1 (commit
8da28681eb1430fb6715c7aef67001acfbbbcba5).
> (It looks like set_4byte() can return failure, but its return code isn't
> checked, and anyway it's only a SPI write so there's no feedback from
> the *chip* if it fails due to lack of WREN; it can only indicate failure
> if the SPI connection falls over.)
>
> So I'm inclined to think of it as a bug fix and include it.
Sure, it's a bug fix. Just a long-standing bug. We were sending
invalid commands to Micron devices, so no n25q256a devices could have
possibly been supported properly before the 3.12-rc cycle [*]. I'm not
sure who actually tested these flash way back in 3.7. I still would
qualify them as "new devices" for 3.12, but that's just semantics now.
Please, do include it.
Brian
[*] Under special circumstances they could have been supported. For
instance, some n25q256a packages defaulted to 4-byte addressing mode.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] ARM: SoC fixes for 3.12-rc
2013-09-20 0:44 ` Brian Norris
@ 2013-09-27 10:59 ` Woodhouse, David
2013-09-27 17:40 ` Brian Norris
0 siblings, 1 reply; 13+ messages in thread
From: Woodhouse, David @ 2013-09-27 10:59 UTC (permalink / raw)
To: Brian Norris
Cc: Olof Johansson, torvalds, arm, linux-arm-kernel, linux-kernel, linux-mtd
[-- Attachment #1: Type: text/plain, Size: 927 bytes --]
On Thu, 2013-09-19 at 17:44 -0700, Brian Norris wrote:
> > Does that m25p80 'fix 4 byte addressing' fix for Micron not also want to
> > go in?
>
> I suppose the m25p80 one can go in as well. It's not so much a bugfix
> as augmenting my original patch to support more devices. But it is
> safe enough.
You say 'support more devices', but AFAICT the code in -rc1 will already
*attempt* to enable 4-byte addressing on those devices, and fail.
(It looks like set_4byte() can return failure, but its return code isn't
checked, and anyway it's only a SPI write so there's no feedback from
the *chip* if it fails due to lack of WREN; it can only indicate failure
if the SPI connection falls over.)
So I'm inclined to think of it as a bug fix and include it.
--
David Woodhouse Open Source Technology Centre
David.Woodhouse@intel.com Intel Corporation
[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 6242 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] ARM: SoC fixes for 3.12-rc
2013-09-19 23:19 ` Woodhouse, David
@ 2013-09-20 0:44 ` Brian Norris
2013-09-27 10:59 ` Woodhouse, David
2013-10-03 5:02 ` Brian Norris
1 sibling, 1 reply; 13+ messages in thread
From: Brian Norris @ 2013-09-20 0:44 UTC (permalink / raw)
To: Woodhouse, David
Cc: Olof Johansson, torvalds, arm, linux-arm-kernel, linux-kernel, linux-mtd
On Thu, Sep 19, 2013 at 4:19 PM, Woodhouse, David
<david.woodhouse@intel.com> wrote:
> On Thu, 2013-09-19 at 15:57 -0700, Brian Norris wrote:
>> On Thu, Sep 19, 2013 at 2:39 PM, Woodhouse, David
>> <david.woodhouse@intel.com> wrote:
>> > On Thu, 2013-09-19 at 12:47 -0700, Olof Johansson wrote:
>> >>
>> >> - A fix for build breakage in the MTD subsystem for some PXA devices.
>> >> David Woodhouse has this patch in his for-next branch but has not been
>> >> responding to our requests to send it up so here it is.
>> >> I should have amended the commit message to describe the build failure for
>> >> CONFIG_OF=n setups, but forgot and now it's down in the stack of commits.
>> >
>> > Thanks for pulling that in. Apologies for the screwup.
>>
>> Speaking of such process issues: there's an outstanding patch for a
>> (small) memory leak that was introduced in the nand_base.c ONFI code
>> in 3.12-rc1. Can I expect you to attend to these sort of -rcX (where X
>> > 1) issues? Or should I send Linus the patch myself? I don't really
>> want it to wait around until 3.13-rc1 to go to -stable.
>
> I'm aware of it, and will get to it shortly. Was going to round it up
> along with the one that Olof just sent, either some time this week at
> Plumbers or when I get home.
>
> If you want to stick it in the linux-mtd.git tree before that and send
> Linus a pull request, I have no objection.
If you're up to it, then you can take it. I'll take it myself if I
feel it's getting too late. The problem is just when I can't
differentiate your quiet awareness from oblivion (or obliviousness?).
> Does that m25p80 'fix 4 byte addressing' fix for Micron not also want to
> go in?
I suppose the m25p80 one can go in as well. It's not so much a bugfix
as augmenting my original patch to support more devices. But it is
safe enough.
Brian
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] ARM: SoC fixes for 3.12-rc
2013-09-19 22:57 ` Brian Norris
@ 2013-09-19 23:19 ` Woodhouse, David
2013-09-20 0:44 ` Brian Norris
2013-10-03 5:02 ` Brian Norris
0 siblings, 2 replies; 13+ messages in thread
From: Woodhouse, David @ 2013-09-19 23:19 UTC (permalink / raw)
To: Brian Norris
Cc: Olof Johansson, torvalds, arm, linux-arm-kernel, linux-kernel, linux-mtd
[-- Attachment #1: Type: text/plain, Size: 1613 bytes --]
On Thu, 2013-09-19 at 15:57 -0700, Brian Norris wrote:
> On Thu, Sep 19, 2013 at 2:39 PM, Woodhouse, David
> <david.woodhouse@intel.com> wrote:
> > On Thu, 2013-09-19 at 12:47 -0700, Olof Johansson wrote:
> >>
> >> - A fix for build breakage in the MTD subsystem for some PXA devices.
> >> David Woodhouse has this patch in his for-next branch but has not been
> >> responding to our requests to send it up so here it is.
> >> I should have amended the commit message to describe the build failure for
> >> CONFIG_OF=n setups, but forgot and now it's down in the stack of commits.
> >
> > Thanks for pulling that in. Apologies for the screwup.
>
> Speaking of such process issues: there's an outstanding patch for a
> (small) memory leak that was introduced in the nand_base.c ONFI code
> in 3.12-rc1. Can I expect you to attend to these sort of -rcX (where X
> > 1) issues? Or should I send Linus the patch myself? I don't really
> want it to wait around until 3.13-rc1 to go to -stable.
I'm aware of it, and will get to it shortly. Was going to round it up
along with the one that Olof just sent, either some time this week at
Plumbers or when I get home.
If you want to stick it in the linux-mtd.git tree before that and send
Linus a pull request, I have no objection.
Does that m25p80 'fix 4 byte addressing' fix for Micron not also want to
go in?
--
Sent with MeeGo's ActiveSync support.
David Woodhouse Open Source Technology Centre
David.Woodhouse@intel.com Intel Corporation
[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 4370 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] ARM: SoC fixes for 3.12-rc
2013-09-19 21:39 ` Woodhouse, David
2013-09-19 22:12 ` Olof Johansson
@ 2013-09-19 22:57 ` Brian Norris
2013-09-19 23:19 ` Woodhouse, David
1 sibling, 1 reply; 13+ messages in thread
From: Brian Norris @ 2013-09-19 22:57 UTC (permalink / raw)
To: Woodhouse, David
Cc: Olof Johansson, torvalds, arm, linux-arm-kernel, linux-kernel, linux-mtd
On Thu, Sep 19, 2013 at 2:39 PM, Woodhouse, David
<david.woodhouse@intel.com> wrote:
> On Thu, 2013-09-19 at 12:47 -0700, Olof Johansson wrote:
>>
>> - A fix for build breakage in the MTD subsystem for some PXA devices.
>> David Woodhouse has this patch in his for-next branch but has not been
>> responding to our requests to send it up so here it is.
>> I should have amended the commit message to describe the build failure for
>> CONFIG_OF=n setups, but forgot and now it's down in the stack of commits.
>
> Thanks for pulling that in. Apologies for the screwup.
Speaking of such process issues: there's an outstanding patch for a
(small) memory leak that was introduced in the nand_base.c ONFI code
in 3.12-rc1. Can I expect you to attend to these sort of -rcX (where X
> 1) issues? Or should I send Linus the patch myself? I don't really
want it to wait around until 3.13-rc1 to go to -stable.
It's in l2-mtd.git (will need cherry-picked out of there) and ready
for the next linux-next:
commit b2bdf43fcc1d440d8f4e1d5c8c59bf2ca76204df
Author: Brian Norris <computersforpeace@gmail.com>
Date: Mon Sep 16 17:59:20 2013 -0700
mtd: nand: fix memory leak in ONFI extended parameter page
Brian
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] ARM: SoC fixes for 3.12-rc
2013-09-19 21:39 ` Woodhouse, David
@ 2013-09-19 22:12 ` Olof Johansson
2013-09-19 22:57 ` Brian Norris
1 sibling, 0 replies; 13+ messages in thread
From: Olof Johansson @ 2013-09-19 22:12 UTC (permalink / raw)
To: Woodhouse, David
Cc: torvalds, arm, linux-arm-kernel, linux-kernel, computersforpeace
On Thu, Sep 19, 2013 at 2:39 PM, Woodhouse, David
<david.woodhouse@intel.com> wrote:
> On Thu, 2013-09-19 at 12:47 -0700, Olof Johansson wrote:
>>
>> - A fix for build breakage in the MTD subsystem for some PXA devices.
>> David Woodhouse has this patch in his for-next branch but has not been
>> responding to our requests to send it up so here it is.
>> I should have amended the commit message to describe the build failure for
>> CONFIG_OF=n setups, but forgot and now it's down in the stack of commits.
>
> Thanks for pulling that in. Apologies for the screwup.
No worries. You're a busy guy these days.
> We were were working on a better way to fix the litter of #ifdef
> CONFIG_OF which wasn't ready for the merge window so I just left this
> one out since it *appeared* to be entirely cosmetic.
Yeah, the real bug is a missing stub function in the #else case, but
if the ifdef is all going away there's no point in adding it.
The ifdeffery around the match tables is something that Mark Brown
brought up yesterday as well. With ACPI_PTR() and of_match_ptr() we at
least don't need the ifdefs in the struct device, but we do still need
it for the match tables.
-Olof
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] ARM: SoC fixes for 3.12-rc
2013-09-19 19:47 Olof Johansson
@ 2013-09-19 21:39 ` Woodhouse, David
2013-09-19 22:12 ` Olof Johansson
2013-09-19 22:57 ` Brian Norris
0 siblings, 2 replies; 13+ messages in thread
From: Woodhouse, David @ 2013-09-19 21:39 UTC (permalink / raw)
To: Olof Johansson
Cc: torvalds, arm, linux-arm-kernel, linux-kernel, computersforpeace
[-- Attachment #1: Type: text/plain, Size: 838 bytes --]
On Thu, 2013-09-19 at 12:47 -0700, Olof Johansson wrote:
>
> - A fix for build breakage in the MTD subsystem for some PXA devices.
> David Woodhouse has this patch in his for-next branch but has not been
> responding to our requests to send it up so here it is.
> I should have amended the commit message to describe the build failure for
> CONFIG_OF=n setups, but forgot and now it's down in the stack of commits.
Thanks for pulling that in. Apologies for the screwup.
We were were working on a better way to fix the litter of #ifdef
CONFIG_OF which wasn't ready for the merge window so I just left this
one out since it *appeared* to be entirely cosmetic.
--
David Woodhouse Open Source Technology Centre
David.Woodhouse@intel.com Intel Corporation
[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 4370 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* [GIT PULL] ARM: SoC fixes for 3.12-rc
@ 2013-09-19 19:47 Olof Johansson
2013-09-19 21:39 ` Woodhouse, David
0 siblings, 1 reply; 13+ messages in thread
From: Olof Johansson @ 2013-09-19 19:47 UTC (permalink / raw)
To: torvalds
Cc: olof, arm, linux-arm-kernel, linux-kernel, computersforpeace,
David.Woodhouse
Hi Linus,
The following changes since commit 272b98c6455f00884f0350f775c5342358ebb73f:
Linux 3.12-rc1 (2013-09-16 16:17:51 -0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/fixes-for-linus
for you to fetch changes up to 660e1c2f47f51f5b03ea7f63fa11f000e0240bda:
Merge tag 'omap-for-v3.12/fixes-dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes (2013-09-18 14:01:39 -0700)
----------------------------------------------------------------
ARM: SoC fixes for 3.12-rc
A set of fixes for ARM platforms for 3.12. Among them:
- A fix for build breakage in the MTD subsystem for some PXA devices.
David Woodhouse has this patch in his for-next branch but has not been
responding to our requests to send it up so here it is.
I should have amended the commit message to describe the build failure for
CONFIG_OF=n setups, but forgot and now it's down in the stack of commits.
- Added device-tree for the BeagleBone Black. Turns out people have been
using the older "regualar" bone DT for the newer boards, and there's
risk of damaging hardware that way.
- Misc DT and regular fixes for OMAP.
- Fix to make the ST-Ericsson "snowball" boards boot with
multi_v7_defconfig, and enable one of the ST-E reference boards on the
same config.
- Kconfig cleanup for u300 to hide submenus when the platform isn't
enabled.
- Enable ARM_ATAG_DTB_COMPAT to let firmware override command
line when booting with an appended devicetree on non-DT-enabled
firmware (needed to boot snowball).
----------------------------------------------------------------
Andrea Adami (1):
ARM: sa1100: collie.c: fall back to jedec_probe flash detection
Anoop Thomas Mathew (1):
ARM: OMAP4 SMP: Corrected a typo fucntions to functions
Arnaud Patard (1):
ARM: imx51.dtsi: fix PATA device clock
Enric Balletbo i Serra (1):
ARM: dts: igep00x0: Add pinmux configuration for MCBSP2
Ezequiel Garcia (1):
mtd: nand: pxa3xx: Remove unneeded ifdef CONFIG_OF
Fabio Estevam (2):
ARM: mach-imx: clk-imx51-imx53: Fix 'spdif1_pred' clock registration
ARM: mach-omap2: gpmc: Fix warning when CONFIG_ARM_LPAE=y
Felipe Balbi (2):
ARM: dts: OMAP5: fix reg property size
ARM: dts: OMAP5: fix ocp2scp DTS data
Gwenhael Goavec-Merou (1):
ARM: imx27.dtsi: fix CSPI PER clock id
Huang Shijie (1):
ARM: dts: imx6q: fix the wrong offset of the Pad Mux register
Jason Liu (1):
ARM: imx: i.mx6d/q: disable the double linefill feature of PL310
Jingoo Han (1):
mailbox: remove unnecessary platform_set_drvdata()
Koen Kooi (1):
ARM: dts: am335x-bone*: add DT for BeagleBone Black
Linus Walleij (3):
ARM: ux500: disable outer cache debug
ARM: u300: hide submenus
ARM: multi_v7: add HREFv60 to multi_v7 defconfig
Olof Johansson (4):
ARM: multi_v7_defconfig: enable ARM_ATAG_DTB_COMPAT
Merge tag 'imx-fixes-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
Merge tag 'omap-for-v3.12/fixes-signed' of git://git.kernel.org/.../tmlind/linux-omap into fixes
Merge tag 'omap-for-v3.12/fixes-dt-signed' of git://git.kernel.org/.../tmlind/linux-omap into fixes
Phil Carmody (1):
ARM: OMAP2+: mux: fix trivial typo in name
Robert Nelson (1):
ARM: dts: omap3-beagle-xm: fix string error in compatible property
Shawn Guo (1):
ARM: imx: initialize clk_init_data.flags for clk-fixup-mux
Tony Lindgren (4):
ARM: dts: Fix muxing and regulator for wl12xx on the SDIO bus for pandaboard
ARM: dts: Fix muxing and regulator for wl12xx on the SDIO bus for blaze
ARM: OMAP4: Fix clock_get error for GPMC during boot
Merge tag 'for_3.12-rc2/dts_signed' of git://git.kernel.org/.../bcousson/linux-omap-dt into omap-for-v3.12/fixes-dt
Vladimir Murzin (1):
ARM: OMAP4: cpuidle: fix: call cpu_cluster_pm_exit conditionally
Wei Yongjun (1):
ARM: OMAP: fix return value check in omap_device_build_from_dt()
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/am335x-bone-common.dtsi | 262 ++++++++++++++++++++++++++++++
arch/arm/boot/dts/am335x-bone.dts | 256 +----------------------------
arch/arm/boot/dts/am335x-boneblack.dts | 17 ++
arch/arm/boot/dts/imx27.dtsi | 6 +-
arch/arm/boot/dts/imx51.dtsi | 2 +-
arch/arm/boot/dts/imx6q-pinfunc.h | 4 +-
arch/arm/boot/dts/omap3-beagle-xm.dts | 2 +-
arch/arm/boot/dts/omap3-igep.dtsi | 14 ++
arch/arm/boot/dts/omap4-panda-common.dtsi | 46 +++++-
arch/arm/boot/dts/omap4-sdp.dts | 39 ++++-
arch/arm/boot/dts/omap5.dtsi | 7 +-
arch/arm/configs/multi_v7_defconfig | 2 +
arch/arm/mach-imx/clk-fixup-mux.c | 1 +
arch/arm/mach-imx/clk-imx51-imx53.c | 2 +-
arch/arm/mach-imx/system.c | 11 ++
arch/arm/mach-omap2/cclock44xx_data.c | 2 +-
arch/arm/mach-omap2/cpuidle44xx.c | 2 +-
arch/arm/mach-omap2/gpmc.c | 4 +-
arch/arm/mach-omap2/mux34xx.c | 2 +-
arch/arm/mach-omap2/omap-smp.c | 2 +-
arch/arm/mach-omap2/omap_device.c | 2 +-
arch/arm/mach-sa1100/collie.c | 2 +-
arch/arm/mach-u300/Kconfig | 10 +-
arch/arm/mach-ux500/cache-l2x0.c | 1 +
drivers/mailbox/mailbox-omap2.c | 1 -
drivers/mtd/nand/pxa3xx_nand.c | 7 -
27 files changed, 418 insertions(+), 289 deletions(-)
create mode 100644 arch/arm/boot/dts/am335x-bone-common.dtsi
create mode 100644 arch/arm/boot/dts/am335x-boneblack.dts
^ permalink raw reply [flat|nested] 13+ messages in thread
* [GIT PULL] ARM: SoC fixes for 3.12-rc
@ 2013-09-12 20:01 Olof Johansson
0 siblings, 0 replies; 13+ messages in thread
From: Olof Johansson @ 2013-09-12 20:01 UTC (permalink / raw)
To: torvalds; +Cc: olof, arm, linux-arm-kernel, linux-kernel
Hi Linus,
The following changes since commit 640414171818c6293c23e74a28d1c69b2a1a7fe5:
Merge tag 'late-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (2013-09-09 16:35:29 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/fixes-for-linus
for you to fetch changes up to f7ec00b3a5e6c18be350ce44dd8c03b36a8fda02:
ARM: dts: sun7i: olinuxino-micro: Enable the EMAC (2013-09-12 12:22:48 -0700)
----------------------------------------------------------------
ARM: SoC fixes for 3.12
A small batch of fixes that have trickled in over the last week of the
merge window.
Also included are few small devicetree updates for sunxi, since it
enables me to use one of their newer boards (cubieboard2) for additional
test coverage. The support for that SoC is new for 3.12, so there's no
exposure to new regressions due to it.
----------------------------------------------------------------
Maxime Ripard (4):
ARM: dts: sun7i: Enable the Ethernet in the A20
ARM: dts: sun7i: Add the muxing options for the EMAC
ARM: dts: sun7i: cubieboard2: Enable the EMAC
ARM: dts: sun7i: olinuxino-micro: Enable the EMAC
Nicolas Pitre (1):
ARM: vexpress: allow dcscb and tc2_pm in a combined ARMv6+v7 build
Olof Johansson (5):
ARM: pxa: ssp: Check return values from phandle lookups
Merge tag 'renesas-fixes3-for-v3.12' of git://git.kernel.org/.../horms/renesas into fixes
Merge branch 'versatile/fixes' into fixes
i2c: davinci: Fix bad dev_get_platdata() conversion
Merge tag 'ep93xx-fixes-for-3.12' of git://github.com/RyanMallon/linux-ep93xx into fixes
Peter Maydell (3):
ARM: PCI: versatile: Fix map_irq function to match hardware
ARM: PCI: versatile: Fix PCI I/O
ARM: PCI: versatile: Fix SMAP register offsets
Petr Štetiar (1):
ARM: ep93xx: Don't use modem interface on the second UART
Simon Horman (2):
ARM: shmobile: r8a7779: Update early timer initialisation order
ARM: shmobile: lager: Do not use register_type field of struct sh_eth_plat_data
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 15 ++++++++
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 15 ++++++++
arch/arm/boot/dts/sun7i-a20.dtsi | 27 ++++++++++++++
arch/arm/mach-ep93xx/core.c | 2 +-
arch/arm/mach-shmobile/board-lager.c | 1 -
arch/arm/mach-shmobile/setup-r8a7779.c | 2 +-
arch/arm/mach-versatile/include/mach/platform.h | 2 ++
arch/arm/mach-versatile/pci.c | 47 ++++++++++++++++---------
arch/arm/mach-vexpress/Makefile | 2 ++
arch/arm/plat-pxa/ssp.c | 18 +++++++---
drivers/i2c/busses/i2c-davinci.c | 2 +-
11 files changed, 108 insertions(+), 25 deletions(-)
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2013-10-25 10:22 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-25 10:21 [GIT PULL] ARM: SoC fixes for 3.12-rc Olof Johansson
-- strict thread matches above, loose matches on Subject: below --
2013-10-13 16:43 Olof Johansson
2013-10-03 4:15 Olof Johansson
2013-09-19 19:47 Olof Johansson
2013-09-19 21:39 ` Woodhouse, David
2013-09-19 22:12 ` Olof Johansson
2013-09-19 22:57 ` Brian Norris
2013-09-19 23:19 ` Woodhouse, David
2013-09-20 0:44 ` Brian Norris
2013-09-27 10:59 ` Woodhouse, David
2013-09-27 17:40 ` Brian Norris
2013-10-03 5:02 ` Brian Norris
2013-09-12 20:01 Olof Johansson
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).