* [GIT PULL] Kirkwood: board changes for v3.7
2012-08-29 0:11 [GIT PULL] Kirkwood: board changes for v3.7 Jason Cooper
@ 2012-09-05 4:34 ` Olof Johansson
2012-09-05 23:44 ` Jason Cooper
2012-09-10 5:31 ` Jason Cooper
2012-09-10 5:40 ` [GIT PULL V2] ARM: cache-l2x0 for rmk's tree Jason Cooper
` (9 subsequent siblings)
10 siblings, 2 replies; 27+ messages in thread
From: Olof Johansson @ 2012-09-05 4:34 UTC (permalink / raw)
To: linux-arm-kernel
Hi Jason,
On Tue, Aug 28, 2012 at 08:11:29PM -0400, Jason Cooper wrote:
> The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee:
>
> Linux 3.6-rc1 (2012-08-02 16:38:10 -0700)
>
> are available in the git repository at:
> git://git.infradead.org/users/jcooper/linux.git boards-for-v3.7-v2
Hmm, this branch contains one duplicate patch due to me applying one
straight to our fixes branch ("ARM: Kirkwood: Fix 'SZ_1M' undeclared here
for db88f6281-bp-setup.c"). I also didn't see that mentioned in the pull
request below, so I'm guessing you added it afterwards. There are also a
couple of merge conflicts with other fixes we have already pulled in from
you, it'd be nice if you just based this branch on those fixes instead.
Also, I wonder if I could have you split up this branch a bit more? My
suggestions are below. You can have branches build on top of each other where
there are dependencies, just please point them out when you send the pull
requests.
Let me know if I'm unclear or if there's something that doesn't make sense,
I'll be happy to help.
-Olof
>
> Alan M Butler (1):
> ARM: Kirkwood: Iomega ix2-200 DT support
New board, so can stay in boards branch
>
> Arnaud Patard (3):
> ARM: Kirkwood: Describe iconnect keys in DT.
> ARM: Kirkwood: Describe iconnect nand in DT.
dt branch material
> ARM: Kirkwood: fix Makefile.boot
fixes for 3.6, or fixes-non-critical that we pick up before anything else in
3.7, your choice.
> Jason Cooper (5):
> ARM: Kirkwood: board-dockstar: use linux/platform_data/mvsdio.h instead of plat/mvsdio.h
> ARM: Kirkwood: use linux/platform_data/mv643xx.h instead of linux/mv643xx.h
> ARM: Kirkwood: Kconfig: keep DT boards together
Those would be cleanup
> ARM: Kirkwood: update defconfig
> ARM: Kirkwood: add DT boards to defconfig
defconfig branch
>
> Sebastian Hesselbarth (2):
> ARM: kirkwood: DT board setup for Seagate FreeAgent Dockstar
> ARM: kirkwood: DT descriptor for Seagate FreeAgent Dockstar
new boards, board branch
>
> Thomas Petazzoni (15):
> arm: add documentation describing Marvell families of SoC
SoC branch or board branch
> mtd: orion_nand: remove <mach/hardware.h> include
cleanup
> arm: plat-orion: use 'void __iomem *' in addr-map code
Hmm, I would prefer if the actual constants were annotated instead of cast in
the code here. See how we handled that on tegra with IOMEM(). That will also
help sparse catch unannotated uses of those constants.
> arm: plat-orion: introduce PLAT_ORION_LEGACY hidden config option
cleanup or soc
> arm: plat-orion: make bridge_virt_base non-const to support DT use case
Hm, dt I suppose.
> arm: mvebu: add basic address decoding support to Armada 370/XP
> arm: mvebu: add address decoding controller to the DT
soc patches, I'd say
> sound: kirkwood: remove useless <plat/audio.h> include
> sound: kirkwood: move <plat/audio.h> to <linux/platform_data/kirkwood-audio.h>
> usb: ehci-orion: move <plat/ehci-orion.h> to <linux/platform_data/ehci-orion.h>
> mmc: mvsdio: move <plat/mvsdio.h> to <linux/platform_data/mvsdio.h>
> dma: mv_xor: move <plat/mv_xor.h> to <linux/platform_data/mv_xor.h>
> mtd: orion_nand: move <plat/orion_nand.h> to <linux/platform_data/orion_nand.h>
> i2c: mv643xx: move <linux/mv643xx_i2c.h> to <linux/platform_data/mv643xx_i2c.h>
> net: mv643xx_eth: move <linux/mv643xx_eth.h> to <linux/platform_data/mv643xx_eth.h>
All above are cleanup.
-Olof
^ permalink raw reply [flat|nested] 27+ messages in thread* [GIT PULL] Kirkwood: board changes for v3.7
2012-09-05 4:34 ` Olof Johansson
@ 2012-09-05 23:44 ` Jason Cooper
2012-09-05 23:58 ` Olof Johansson
2012-09-10 5:31 ` Jason Cooper
1 sibling, 1 reply; 27+ messages in thread
From: Jason Cooper @ 2012-09-05 23:44 UTC (permalink / raw)
To: linux-arm-kernel
Olof,
Thanks for the help!
On Tue, Sep 04, 2012 at 09:34:35PM -0700, Olof Johansson wrote:
> On Tue, Aug 28, 2012 at 08:11:29PM -0400, Jason Cooper wrote:
> > The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee:
> >
> > Linux 3.6-rc1 (2012-08-02 16:38:10 -0700)
> >
> > are available in the git repository at:
> > git://git.infradead.org/users/jcooper/linux.git boards-for-v3.7-v2
>
> Hmm, this branch contains one duplicate patch due to me applying one
> straight to our fixes branch ("ARM: Kirkwood: Fix 'SZ_1M' undeclared here
> for db88f6281-bp-setup.c"). I also didn't see that mentioned in the pull
> request below, so I'm guessing you added it afterwards. There are also a
> couple of merge conflicts with other fixes we have already pulled in from
> you, it'd be nice if you just based this branch on those fixes instead.
>
> Also, I wonder if I could have you split up this branch a bit more? My
> suggestions are below. You can have branches build on top of each other where
> there are dependencies, just please point them out when you send the pull
> requests.
>
>
> Let me know if I'm unclear or if there's something that doesn't make sense,
> I'll be happy to help.
No problem, but I do have one question. Say I have two branches,
fixes
dt
And then a 'board' patch depends on stuff in both fixes and dt. If I base
the board branch on fixes, do I 'git merge' the dt branch, 'git
cherry-pick' the dependency (what I did before), or something else I'm
not aware of?
I've avoided 'git merge' up till now because it creates a merge commit,
which feels wrong. Perhaps I'm wrong here?
All the branch assignments look good, assuming I can figure out the
above question.
> >
...
> > arm: plat-orion: use 'void __iomem *' in addr-map code
>
> Hmm, I would prefer if the actual constants were annotated instead of cast in
> the code here. See how we handled that on tegra with IOMEM(). That will also
> help sparse catch unannotated uses of those constants.
>
I'll ask Thomas if he can redo this one.
thx,
Jason.
^ permalink raw reply [flat|nested] 27+ messages in thread* [GIT PULL] Kirkwood: board changes for v3.7
2012-09-05 23:44 ` Jason Cooper
@ 2012-09-05 23:58 ` Olof Johansson
0 siblings, 0 replies; 27+ messages in thread
From: Olof Johansson @ 2012-09-05 23:58 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Wed, Sep 5, 2012 at 4:44 PM, Jason Cooper <jason@lakedaemon.net> wrote:
> Olof,
>
> Thanks for the help!
>
> On Tue, Sep 04, 2012 at 09:34:35PM -0700, Olof Johansson wrote:
>> On Tue, Aug 28, 2012 at 08:11:29PM -0400, Jason Cooper wrote:
>> > The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee:
>> >
>> > Linux 3.6-rc1 (2012-08-02 16:38:10 -0700)
>> >
>> > are available in the git repository at:
>> > git://git.infradead.org/users/jcooper/linux.git boards-for-v3.7-v2
>>
>> Hmm, this branch contains one duplicate patch due to me applying one
>> straight to our fixes branch ("ARM: Kirkwood: Fix 'SZ_1M' undeclared here
>> for db88f6281-bp-setup.c"). I also didn't see that mentioned in the pull
>> request below, so I'm guessing you added it afterwards. There are also a
>> couple of merge conflicts with other fixes we have already pulled in from
>> you, it'd be nice if you just based this branch on those fixes instead.
>>
>> Also, I wonder if I could have you split up this branch a bit more? My
>> suggestions are below. You can have branches build on top of each other where
>> there are dependencies, just please point them out when you send the pull
>> requests.
>>
>>
>> Let me know if I'm unclear or if there's something that doesn't make sense,
>> I'll be happy to help.
>
> No problem, but I do have one question. Say I have two branches,
>
> fixes
> dt
>
> And then a 'board' patch depends on stuff in both fixes and dt. If I base
> the board branch on fixes, do I 'git merge' the dt branch, 'git
> cherry-pick' the dependency (what I did before), or something else I'm
> not aware of?
Merge is the way to go, otherwise you will have new commits with the
same contents in the new branch.
> I've avoided 'git merge' up till now because it creates a merge commit,
> which feels wrong. Perhaps I'm wrong here?
It depends on what phase of development you're in, but for something
like this it's the perfectly sane thing to do. There's nothing wrong
with a few merge commits to bring in dependencies, etc.
> All the branch assignments look good, assuming I can figure out the
> above question.
Sounds good. I think the above is a sufficient answer but let me know
if you disagree. :-)
>> > arm: plat-orion: use 'void __iomem *' in addr-map code
>>
>> Hmm, I would prefer if the actual constants were annotated instead of cast in
>> the code here. See how we handled that on tegra with IOMEM(). That will also
>> help sparse catch unannotated uses of those constants.
>>
>
> I'll ask Thomas if he can redo this one.
Thanks!
-Olof
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL] Kirkwood: board changes for v3.7
2012-09-05 4:34 ` Olof Johansson
2012-09-05 23:44 ` Jason Cooper
@ 2012-09-10 5:31 ` Jason Cooper
1 sibling, 0 replies; 27+ messages in thread
From: Jason Cooper @ 2012-09-10 5:31 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Sep 04, 2012 at 09:34:35PM -0700, Olof Johansson wrote:
> Hi Jason,
>
>
> On Tue, Aug 28, 2012 at 08:11:29PM -0400, Jason Cooper wrote:
> > The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee:
> >
> > Linux 3.6-rc1 (2012-08-02 16:38:10 -0700)
> >
> > are available in the git repository at:
> > git://git.infradead.org/users/jcooper/linux.git boards-for-v3.7-v2
>
> Hmm, this branch contains one duplicate patch due to me applying one
> straight to our fixes branch ("ARM: Kirkwood: Fix 'SZ_1M' undeclared here
> for db88f6281-bp-setup.c"). I also didn't see that mentioned in the pull
> request below, so I'm guessing you added it afterwards. There are also a
> couple of merge conflicts with other fixes we have already pulled in from
> you, it'd be nice if you just based this branch on those fixes instead.
I'm issuing new pull-requests broken up as you suggested, based on
v3.6-rc5, which incorporates my previous 'fixes-for-v3.6*' pull request.
So, hopefully it should go much better. ;-)
> Also, I wonder if I could have you split up this branch a bit more? My
> suggestions are below. You can have branches build on top of each other where
> there are dependencies, just please point them out when you send the pull
> requests.
Done.
Migration from previous monolithic branch is as follows:
> >
> > Alan M Butler (1):
> > ARM: Kirkwood: Iomega ix2-200 DT support
>
> New board, so can stay in boards branch
Done, kirkwood/boards
> > Arnaud Patard (3):
> > ARM: Kirkwood: Describe iconnect keys in DT.
> > ARM: Kirkwood: Describe iconnect nand in DT.
>
> dt branch material
Done, kirkwood/dt
> > ARM: Kirkwood: fix Makefile.boot
>
> fixes for 3.6, or fixes-non-critical that we pick up before anything else in
> 3.7, your choice.
dropped from PR, it's in v3.6-rc5
> > Jason Cooper (5):
> > ARM: Kirkwood: board-dockstar: use linux/platform_data/mvsdio.h instead of plat/mvsdio.h
> > ARM: Kirkwood: use linux/platform_data/mv643xx.h instead of linux/mv643xx.h
> > ARM: Kirkwood: Kconfig: keep DT boards together
>
> Those would be cleanup
Done, kirkwood/cleanup. Except #3 (keep DT boards together), I had to
edit the original patch anyway (submitter new to git), so I incorporated
the change in the original patch. It was purely menuconfig cosmetic.
> > ARM: Kirkwood: update defconfig
> > ARM: Kirkwood: add DT boards to defconfig
>
> defconfig branch
Done, kirkwood/defconfig. Updated to include km_kirkwood.
> > Sebastian Hesselbarth (2):
> > ARM: kirkwood: DT board setup for Seagate FreeAgent Dockstar
> > ARM: kirkwood: DT descriptor for Seagate FreeAgent Dockstar
>
> new boards, board branch
Done, kirkwood/boards.
> > Thomas Petazzoni (15):
> > arm: add documentation describing Marvell families of SoC
>
> SoC branch or board branch
Done, kirkwood/boards.
> > mtd: orion_nand: remove <mach/hardware.h> include
>
> cleanup
Taken in via l2-mtd.git, so dropped from my branches, will note the
dependency.
> > arm: plat-orion: use 'void __iomem *' in addr-map code
>
> Hmm, I would prefer if the actual constants were annotated instead of cast in
> the code here. See how we handled that on tegra with IOMEM(). That will also
> help sparse catch unannotated uses of those constants.
>
> > arm: plat-orion: introduce PLAT_ORION_LEGACY hidden config option
>
> cleanup or soc
>
> > arm: plat-orion: make bridge_virt_base non-const to support DT use case
>
> Hm, dt I suppose.
>
> > arm: mvebu: add basic address decoding support to Armada 370/XP
> > arm: mvebu: add address decoding controller to the DT
>
> soc patches, I'd say
The above block was one series. They have been dropped until Thomas can
respond to your comment.
> > sound: kirkwood: remove useless <plat/audio.h> include
> > sound: kirkwood: move <plat/audio.h> to <linux/platform_data/kirkwood-audio.h>
> > usb: ehci-orion: move <plat/ehci-orion.h> to <linux/platform_data/ehci-orion.h>
> > mmc: mvsdio: move <plat/mvsdio.h> to <linux/platform_data/mvsdio.h>
> > dma: mv_xor: move <plat/mv_xor.h> to <linux/platform_data/mv_xor.h>
> > mtd: orion_nand: move <plat/orion_nand.h> to <linux/platform_data/orion_nand.h>
> > i2c: mv643xx: move <linux/mv643xx_i2c.h> to <linux/platform_data/mv643xx_i2c.h>
> > net: mv643xx_eth: move <linux/mv643xx_eth.h> to <linux/platform_data/mv643xx_eth.h>
>
> All above are cleanup.
Done, kirkwood/cleanup.
thx,
Jason.
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL V2] ARM: cache-l2x0 for rmk's tree
2012-08-29 0:11 [GIT PULL] Kirkwood: board changes for v3.7 Jason Cooper
2012-09-05 4:34 ` Olof Johansson
@ 2012-09-10 5:40 ` Jason Cooper
2012-09-10 5:48 ` [GIT PULL V2 1/4] ARM: Kirkwood: DT bindings for v3.7 Jason Cooper
` (8 subsequent siblings)
10 siblings, 0 replies; 27+ messages in thread
From: Jason Cooper @ 2012-09-10 5:40 UTC (permalink / raw)
To: linux-arm-kernel
On Will Deacon's advice, this pull-request is intended to go through
rmk's tree. It is a dependency for subsequent branches going through
arm-soc. Please let me know if I've flubbed this up in any way.
thx,
Jason.
The following changes since commit 55d512e245bc7699a8800e23df1a24195dd08217:
Linux 3.6-rc5 (2012-09-08 16:43:45 -0700)
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git arm/cache-l2x0
Gregory CLEMENT (2):
arm: cache-l2x0: make outer_cache_fns a field of l2x0_of_data
arm: cache-l2x0: add an optional register to save/restore
arch/arm/include/asm/hardware/cache-l2x0.h | 1 +
arch/arm/mm/cache-l2x0.c | 38 ++++++++++++++++++++++------
2 files changed, 31 insertions(+), 8 deletions(-)
^ permalink raw reply [flat|nested] 27+ messages in thread* [GIT PULL V2 1/4] ARM: Kirkwood: DT bindings for v3.7
2012-08-29 0:11 [GIT PULL] Kirkwood: board changes for v3.7 Jason Cooper
2012-09-05 4:34 ` Olof Johansson
2012-09-10 5:40 ` [GIT PULL V2] ARM: cache-l2x0 for rmk's tree Jason Cooper
@ 2012-09-10 5:48 ` Jason Cooper
2012-09-13 5:30 ` Olof Johansson
2012-09-10 5:57 ` [GIT PULL V2 2/4] ARM: Kirkwood: boards " Jason Cooper
` (7 subsequent siblings)
10 siblings, 1 reply; 27+ messages in thread
From: Jason Cooper @ 2012-09-10 5:48 UTC (permalink / raw)
To: linux-arm-kernel
Arnd, Olof,
This branch depends on arm/cache-l2x0 which is going in through rmk's
tree. arm/cache-l2x0 contains the following from Gregory Clement:
arm: cache-l2x0: make outer_cache_fns a field of l2x0_of_data
arm: cache-l2x0: add an optional register to save/restore
When I created kirkwood/dt, I merged arm/cache-l2x0. So, you shouldn't
get a conflict when you pull both of these, right? Or, should I do the
request-pull based on arm/cache-l2x0? That doesn't sound right. Just
let me know if I need to fix it.
thx,
Jason.
The following changes since commit 55d512e245bc7699a8800e23df1a24195dd08217:
Linux 3.6-rc5 (2012-09-08 16:43:45 -0700)
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git kirkwood/dt
Andrew Lunn (3):
ARM: Kirkwood: ehci-orion: Add device tree binding
ARM: Kirkwood: Convert all DT boards to EHCI via DT.
Crypto: CESA: Add support for DT based instantiation.
Arnaud Patard (2):
ARM: Kirkwood: Describe iconnect keys in DT.
ARM: Kirkwood: Describe iconnect nand in DT.
Gregory CLEMENT (6):
arm: cache-l2x0: make outer_cache_fns a field of l2x0_of_data
arm: cache-l2x0: add an optional register to save/restore
arm: cache-l2x0: add support for Aurora L2 cache ctrl
arm: mvebu: add L2 cache support
arm: mvebu: add Aurora L2 Cache Controller to the DT
arm: l2x0: add aurora related properties to OF binding
Documentation/devicetree/bindings/arm/l2cc.txt | 9 +
.../devicetree/bindings/crypto/mv_cesa.txt | 20 ++
.../devicetree/bindings/usb/ehci-orion.txt | 19 ++
arch/arm/boot/dts/armada-370.dtsi | 6 +
arch/arm/boot/dts/armada-xp.dtsi | 7 +
arch/arm/boot/dts/kirkwood-iconnect.dts | 50 ++++-
arch/arm/boot/dts/kirkwood.dtsi | 20 ++-
arch/arm/include/asm/hardware/cache-aurora-l2.h | 55 ++++
arch/arm/include/asm/hardware/cache-l2x0.h | 5 +
arch/arm/mach-kirkwood/board-dnskw.c | 1 -
arch/arm/mach-kirkwood/board-dreamplug.c | 1 -
arch/arm/mach-kirkwood/board-dt.c | 3 +-
arch/arm/mach-kirkwood/board-goflexnet.c | 1 -
arch/arm/mach-kirkwood/board-ib62x0.c | 1 -
arch/arm/mach-kirkwood/board-iconnect.c | 49 ----
arch/arm/mach-kirkwood/board-lsxl.c | 1 -
arch/arm/mach-kirkwood/board-ts219.c | 1 -
arch/arm/mach-mvebu/Kconfig | 1 +
arch/arm/mach-mvebu/irq-armada-370-xp.c | 4 +
arch/arm/mm/cache-l2x0.c | 275 ++++++++++++++++++--
drivers/crypto/mv_cesa.c | 17 +-
drivers/usb/host/ehci-orion.c | 61 ++++-
22 files changed, 522 insertions(+), 85 deletions(-)
create mode 100644 Documentation/devicetree/bindings/crypto/mv_cesa.txt
create mode 100644 Documentation/devicetree/bindings/usb/ehci-orion.txt
create mode 100644 arch/arm/include/asm/hardware/cache-aurora-l2.h
^ permalink raw reply [flat|nested] 27+ messages in thread* [GIT PULL V2 1/4] ARM: Kirkwood: DT bindings for v3.7
2012-09-10 5:48 ` [GIT PULL V2 1/4] ARM: Kirkwood: DT bindings for v3.7 Jason Cooper
@ 2012-09-13 5:30 ` Olof Johansson
2012-09-18 17:24 ` Jason Cooper
0 siblings, 1 reply; 27+ messages in thread
From: Olof Johansson @ 2012-09-13 5:30 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Sep 10, 2012 at 01:48:35AM -0400, Jason Cooper wrote:
> Arnd, Olof,
>
> This branch depends on arm/cache-l2x0 which is going in through rmk's
> tree. arm/cache-l2x0 contains the following from Gregory Clement:
>
> arm: cache-l2x0: make outer_cache_fns a field of l2x0_of_data
> arm: cache-l2x0: add an optional register to save/restore
Ok, we need to make sure that Russell is happy with the patches and
is pulling them in (with an agreement to not rebase the merged branch)
before we can pull in your branch that builds on it.
Russell, please let us know if/when that's the case so we can merge in the
dependent code.
Thanks!
-Olof
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL V2 1/4] ARM: Kirkwood: DT bindings for v3.7
2012-09-13 5:30 ` Olof Johansson
@ 2012-09-18 17:24 ` Jason Cooper
2012-09-19 13:59 ` Arnd Bergmann
0 siblings, 1 reply; 27+ messages in thread
From: Jason Cooper @ 2012-09-18 17:24 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Sep 12, 2012 at 10:30:45PM -0700, Olof Johansson wrote:
> On Mon, Sep 10, 2012 at 01:48:35AM -0400, Jason Cooper wrote:
> > Arnd, Olof,
> >
> > This branch depends on arm/cache-l2x0 which is going in through rmk's
> > tree. arm/cache-l2x0 contains the following from Gregory Clement:
> >
> > arm: cache-l2x0: make outer_cache_fns a field of l2x0_of_data
> > arm: cache-l2x0: add an optional register to save/restore
>
> Ok, we need to make sure that Russell is happy with the patches and
> is pulling them in (with an agreement to not rebase the merged branch)
> before we can pull in your branch that builds on it.
Arnd, Olof,
Ok, I'm still mastering the art of branch dependencies. The acceptance
of Gregory's cache-l2x0 series is holding up everything else.
Rightfully so, rmk has some issues with it.
However, in my pullrqs and in my branch merging I treated it as a
dependency for everything that came after it (pr 1,2,3,4). I'd like to
undo that now to get things moving. The dependency was not strictly
necessary, I was simply trying to achieve an ordering of branches.
The only way I know to do this is to redo my branches and republish.
Basically, I would remove Gregory's patches and the dependency on 'arm:
cache-l2x0' from pullrq [1/4] Kirkwood DT bindings.
Obviously, this would break things for folks tracking my branches.
Hopefully anyone crazy enough to track my branches is competent enough
rebase onto the new branches. Even still, I don't want to mess anyone up.
I think the benefits of getting these patches in for this merge window
outweigh a onetime breaking of my branches. Is there anything I'm not
considering before I do this?
I'll do the work now, but hold off on pushing or sending new pullrq's
for a day or two or until I hear from you guys.
thx,
Jason.
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL V2 1/4] ARM: Kirkwood: DT bindings for v3.7
2012-09-18 17:24 ` Jason Cooper
@ 2012-09-19 13:59 ` Arnd Bergmann
0 siblings, 0 replies; 27+ messages in thread
From: Arnd Bergmann @ 2012-09-19 13:59 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 18 September 2012, Jason Cooper wrote:
> Ok, I'm still mastering the art of branch dependencies. The acceptance
> of Gregory's cache-l2x0 series is holding up everything else.
> Rightfully so, rmk has some issues with it.
>
> However, in my pullrqs and in my branch merging I treated it as a
> dependency for everything that came after it (pr 1,2,3,4). I'd like to
> undo that now to get things moving. The dependency was not strictly
> necessary, I was simply trying to achieve an ordering of branches.
>
> The only way I know to do this is to redo my branches and republish.
> Basically, I would remove Gregory's patches and the dependency on 'arm:
> cache-l2x0' from pullrq [1/4] Kirkwood DT bindings.
Right, makes sense.
> Obviously, this would break things for folks tracking my branches.
> Hopefully anyone crazy enough to track my branches is competent enough
> rebase onto the new branches. Even still, I don't want to mess anyone up.
>
> I think the benefits of getting these patches in for this merge window
> outweigh a onetime breaking of my branches. Is there anything I'm not
> considering before I do this?
>
> I'll do the work now, but hold off on pushing or sending new pullrq's
> for a day or two or until I hear from you guys.
My rule is normally that I treat any branches coming from subarchitecture
maintainers as unstable until they are merged into arm-soc.
If you haven't promised anyone to keep your branches stable, I see no
problem with rebasing them to avoid the dependency.
Arnd
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL V2 2/4] ARM: Kirkwood: boards for v3.7
2012-08-29 0:11 [GIT PULL] Kirkwood: board changes for v3.7 Jason Cooper
` (2 preceding siblings ...)
2012-09-10 5:48 ` [GIT PULL V2 1/4] ARM: Kirkwood: DT bindings for v3.7 Jason Cooper
@ 2012-09-10 5:57 ` Jason Cooper
2012-09-10 6:03 ` [GIT PULL V2 3/4] ARM: Kirkwood: cleanup " Jason Cooper
` (6 subsequent siblings)
10 siblings, 0 replies; 27+ messages in thread
From: Jason Cooper @ 2012-09-10 5:57 UTC (permalink / raw)
To: linux-arm-kernel
Arnd, Olof,
This PR is based on v3.6-rc5 and depends upon kirkwood/dt.
It also depends upon the following in l2-mtd.git:
mtd: orion_nand: remove <mach/hardware.h> include
Although this is a corner case. The user needs to select ARCH_MVEBU=y
_and_ MTD_NAND_ORION=[y|m], which mvebu doesn't use. I only ran across
in by accident.
thx,
Jason.
The following changes since commit 5d7b3dd7c8dc06679027a57750f4415b3f9b21ad:
arm: l2x0: add aurora related properties to OF binding (2012-09-10 03:56:57 +0000)
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git kirkwood/boards
Alan M Butler (1):
ARM: Kirkwood: Iomega ix2-200 DT support
Sebastian Hesselbarth (8):
ARM: kirkwood: DT board setup for Seagate FreeAgent Dockstar
ARM: kirkwood: DT descriptor for Seagate FreeAgent Dockstar
ARM: dove: unify clock setup
ARM: dove: add clock gating control
ARM: dove: add crypto engine
ARM: dove: add device tree based machine descriptor
ARM: dove: add device tree descriptors
ARM: dove: SolidRun CuBox DT
Thomas Petazzoni (1):
arm: add documentation describing Marvell families of SoC
Valentin Longchamp (1):
ARM: initial DTS support for km_kirkwood
Documentation/arm/Marvell/README | 232 +++++++++++++++++++++++++
arch/arm/boot/dts/dove-cm-a510.dts | 38 ++++
arch/arm/boot/dts/dove-cubox.dts | 42 +++++
arch/arm/boot/dts/dove-dove-db.dts | 38 ++++
arch/arm/boot/dts/dove.dtsi | 143 +++++++++++++++
arch/arm/boot/dts/kirkwood-dockstar.dts | 57 ++++++
arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 105 +++++++++++
arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 29 +++
arch/arm/mach-dove/Kconfig | 7 +
arch/arm/mach-dove/Makefile.boot | 4 +
arch/arm/mach-dove/common.c | 154 +++++++++++++++--
arch/arm/mach-dove/include/mach/pm.h | 54 ++++--
arch/arm/mach-kirkwood/Kconfig | 21 +++
arch/arm/mach-kirkwood/Makefile | 3 +
arch/arm/mach-kirkwood/Makefile.boot | 3 +
arch/arm/mach-kirkwood/board-dockstar.c | 61 +++++++
arch/arm/mach-kirkwood/board-dt.c | 12 ++
arch/arm/mach-kirkwood/board-iomega_ix2_200.c | 57 ++++++
arch/arm/mach-kirkwood/board-km_kirkwood.c | 57 ++++++
arch/arm/mach-kirkwood/common.h | 18 ++
20 files changed, 1105 insertions(+), 30 deletions(-)
create mode 100644 Documentation/arm/Marvell/README
create mode 100644 arch/arm/boot/dts/dove-cm-a510.dts
create mode 100644 arch/arm/boot/dts/dove-cubox.dts
create mode 100644 arch/arm/boot/dts/dove-dove-db.dts
create mode 100644 arch/arm/boot/dts/dove.dtsi
create mode 100644 arch/arm/boot/dts/kirkwood-dockstar.dts
create mode 100644 arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
create mode 100644 arch/arm/boot/dts/kirkwood-km_kirkwood.dts
create mode 100644 arch/arm/mach-kirkwood/board-dockstar.c
create mode 100644 arch/arm/mach-kirkwood/board-iomega_ix2_200.c
create mode 100644 arch/arm/mach-kirkwood/board-km_kirkwood.c
^ permalink raw reply [flat|nested] 27+ messages in thread* [GIT PULL V2 3/4] ARM: Kirkwood: cleanup for v3.7
2012-08-29 0:11 [GIT PULL] Kirkwood: board changes for v3.7 Jason Cooper
` (3 preceding siblings ...)
2012-09-10 5:57 ` [GIT PULL V2 2/4] ARM: Kirkwood: boards " Jason Cooper
@ 2012-09-10 6:03 ` Jason Cooper
2012-09-10 6:07 ` [GIT PULL V2 4/4] ARM: Kirkwood: defconfig changes " Jason Cooper
` (5 subsequent siblings)
10 siblings, 0 replies; 27+ messages in thread
From: Jason Cooper @ 2012-09-10 6:03 UTC (permalink / raw)
To: linux-arm-kernel
Arnd, Olof,
This PR is based upon v3.6-rc5 and depends upon kirkwood/boards.
thx,
Jason.
The following changes since commit 45f70b96618d425e9479a787d96692fe607e9cc8:
ARM: dove: SolidRun CuBox DT (2012-09-10 05:00:54 +0000)
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git kirkwood/cleanup
Jason Cooper (3):
ARM: Kirkwood: ehci now specified in kirkwood.dtsi. remove legacy platform init
ARM: Kirkwood: board-dockstar: use linux/platform_data/mvsdio.h instead of plat/mvsdio.h
ARM: Kirkwood: use linux/platform_data/mv643xx.h instead of linux/mv643xx.h
Thomas Petazzoni (8):
sound: kirkwood: remove useless <plat/audio.h> include
sound: kirkwood: move <plat/audio.h> to <linux/platform_data/kirkwood-audio.h>
usb: ehci-orion: move <plat/ehci-orion.h> to <linux/platform_data/ehci-orion.h>
mmc: mvsdio: move <plat/mvsdio.h> to <linux/platform_data/mvsdio.h>
dma: mv_xor: move <plat/mv_xor.h> to <linux/platform_data/mv_xor.h>
mtd: orion_nand: move <plat/orion_nand.h> to <linux/platform_data/orion_nand.h>
i2c: mv643xx: move <linux/mv643xx_i2c.h> to <linux/platform_data/mv643xx_i2c.h>
net: mv643xx_eth: move <linux/mv643xx_eth.h> to <linux/platform_data/mv643xx_eth.h>
arch/arm/mach-dove/cm-a510.c | 2 +-
arch/arm/mach-dove/common.c | 3 +--
arch/arm/mach-dove/dove-db-setup.c | 2 +-
arch/arm/mach-kirkwood/board-dnskw.c | 2 +-
arch/arm/mach-kirkwood/board-dockstar.c | 5 ++---
arch/arm/mach-kirkwood/board-dreamplug.c | 4 ++--
arch/arm/mach-kirkwood/board-goflexnet.c | 4 ++--
arch/arm/mach-kirkwood/board-ib62x0.c | 2 +-
arch/arm/mach-kirkwood/board-iconnect.c | 3 ++-
arch/arm/mach-kirkwood/board-iomega_ix2_200.c | 4 +---
arch/arm/mach-kirkwood/board-km_kirkwood.c | 1 -
arch/arm/mach-kirkwood/board-lsxl.c | 2 +-
arch/arm/mach-kirkwood/board-ts219.c | 2 +-
arch/arm/mach-kirkwood/common.c | 12 ++++++------
arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 +-
arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 4 ++--
arch/arm/mach-kirkwood/dockstar-setup.c | 4 ++--
arch/arm/mach-kirkwood/guruplug-setup.c | 4 ++--
arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 2 +-
arch/arm/mach-kirkwood/netspace_v2-setup.c | 2 +-
arch/arm/mach-kirkwood/netxbig_v2-setup.c | 2 +-
arch/arm/mach-kirkwood/openrd-setup.c | 4 ++--
arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 +-
arch/arm/mach-kirkwood/rd88f6281-setup.c | 4 ++--
arch/arm/mach-kirkwood/sheevaplug-setup.c | 4 ++--
arch/arm/mach-kirkwood/t5325-setup.c | 2 +-
arch/arm/mach-kirkwood/ts219-setup.c | 2 +-
arch/arm/mach-kirkwood/ts41x-setup.c | 2 +-
arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 2 +-
arch/arm/mach-mv78xx0/common.c | 4 ++--
arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 2 +-
arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 2 +-
arch/arm/mach-orion5x/common.c | 6 +++---
arch/arm/mach-orion5x/d2net-setup.c | 2 +-
arch/arm/mach-orion5x/db88f5281-setup.c | 4 ++--
arch/arm/mach-orion5x/dns323-setup.c | 2 +-
arch/arm/mach-orion5x/edmini_v2-setup.c | 2 +-
arch/arm/mach-orion5x/kurobox_pro-setup.c | 4 ++--
arch/arm/mach-orion5x/ls-chl-setup.c | 2 +-
arch/arm/mach-orion5x/ls_hgl-setup.c | 2 +-
arch/arm/mach-orion5x/lsmini-setup.c | 2 +-
arch/arm/mach-orion5x/mss2-setup.c | 2 +-
arch/arm/mach-orion5x/mv2120-setup.c | 2 +-
arch/arm/mach-orion5x/net2big-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f5182-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 2 +-
arch/arm/mach-orion5x/terastation_pro2-setup.c | 2 +-
arch/arm/mach-orion5x/ts209-setup.c | 2 +-
arch/arm/mach-orion5x/ts409-setup.c | 2 +-
arch/arm/mach-orion5x/ts78xx-setup.c | 2 +-
arch/arm/mach-orion5x/tsx09-common.c | 2 +-
arch/arm/mach-orion5x/wnr854t-setup.c | 2 +-
arch/arm/mach-orion5x/wrt350n-v2-setup.c | 2 +-
arch/arm/plat-orion/common.c | 8 ++++----
arch/arm/plat-orion/include/plat/audio.h | 7 -------
arch/arm/plat-orion/include/plat/common.h | 2 +-
drivers/dma/mv_xor.c | 2 +-
drivers/i2c/busses/i2c-mv64xxx.c | 2 +-
drivers/mmc/host/mvsdio.c | 2 +-
drivers/mtd/nand/orion_nand.c | 2 +-
drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +-
include/linux/mv643xx.h | 4 ++--
.../linux/platform_data}/ehci-orion.h | 6 ++----
include/linux/platform_data/kirkwood-audio.h | 7 +++++++
include/linux/{ => platform_data}/mv643xx_eth.h | 4 ++--
include/linux/{ => platform_data}/mv643xx_i2c.h | 4 ++--
.../plat => include/linux/platform_data}/mv_xor.h | 6 ++----
.../plat => include/linux/platform_data}/mvsdio.h | 6 ++----
.../linux/platform_data}/orion_nand.h | 6 ++----
sound/soc/kirkwood/kirkwood-i2s.c | 2 +-
sound/soc/kirkwood/kirkwood-openrd.c | 1 -
sound/soc/kirkwood/kirkwood-t5325.c | 1 -
74 files changed, 106 insertions(+), 120 deletions(-)
delete mode 100644 arch/arm/plat-orion/include/plat/audio.h
rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/ehci-orion.h (78%)
create mode 100644 include/linux/platform_data/kirkwood-audio.h
rename include/linux/{ => platform_data}/mv643xx_eth.h (96%)
rename include/linux/{ => platform_data}/mv643xx_i2c.h (89%)
rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/mv_xor.h (77%)
rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/mvsdio.h (77%)
rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/orion_nand.h (82%)
^ permalink raw reply [flat|nested] 27+ messages in thread* [GIT PULL V2 4/4] ARM: Kirkwood: defconfig changes for v3.7
2012-08-29 0:11 [GIT PULL] Kirkwood: board changes for v3.7 Jason Cooper
` (4 preceding siblings ...)
2012-09-10 6:03 ` [GIT PULL V2 3/4] ARM: Kirkwood: cleanup " Jason Cooper
@ 2012-09-10 6:07 ` Jason Cooper
2012-09-21 19:41 ` [GIT PULL V3 1/5] ARM: Kirkwood: address decoding change " Jason Cooper
` (4 subsequent siblings)
10 siblings, 0 replies; 27+ messages in thread
From: Jason Cooper @ 2012-09-10 6:07 UTC (permalink / raw)
To: linux-arm-kernel
Arnd, Olof,
This PR is based on v3.6-rc5 and depends on kirkwood/cleanup.
thx,
Jason.
The following changes since commit f82671fa39f5cccd4a3e93249d56c5664e1d78dc:
ARM: Kirkwood: use linux/platform_data/mv643xx.h instead of linux/mv643xx.h (2012-09-10 05:06:12 +0000)
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git kirkwood/defconfig
Jason Cooper (2):
ARM: Kirkwood: update defconfig
ARM: Kirkwood: add DT boards to defconfig
arch/arm/configs/kirkwood_defconfig | 38 +++++++++++++++++-----------------
1 files changed, 19 insertions(+), 19 deletions(-)
^ permalink raw reply [flat|nested] 27+ messages in thread* [GIT PULL V3 1/5] ARM: Kirkwood: address decoding change for v3.7
2012-08-29 0:11 [GIT PULL] Kirkwood: board changes for v3.7 Jason Cooper
` (5 preceding siblings ...)
2012-09-10 6:07 ` [GIT PULL V2 4/4] ARM: Kirkwood: defconfig changes " Jason Cooper
@ 2012-09-21 19:41 ` Jason Cooper
2012-09-22 5:29 ` Olof Johansson
2012-09-21 19:46 ` [GIT PULL V3 2/5] ARM: Kirkwood: DT changes " Jason Cooper
` (3 subsequent siblings)
10 siblings, 1 reply; 27+ messages in thread
From: Jason Cooper @ 2012-09-21 19:41 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 55d512e245bc7699a8800e23df1a24195dd08217:
Linux 3.6-rc5 (2012-09-08 16:43:45 -0700)
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git kirkwood/addr_decode
Thomas Petazzoni (17):
arm: mach-dove: use plus instead of or for address definitions
arm: mach-kirkwood: use plus instead of or for address definitions
arm: mach-mv78xx0: use plus instead of or for address definitions
arm: mach-orion5x: use plus instead of or for address definitions
arm: mach-dove: use IOMEM() for base address definitions
arm: mach-kirkwood: use IOMEM() for base address definitions
arm: mach-mv78xx0: use IOMEM() for base address definitions
arm: mach-orion5x: use IOMEM() for base address definitions
arm: mach-mvebu: use IOMEM() for base address definitions
arm: plat-orion: use void __iomem pointers for UART registration functions
arm: plat-orion: use void __iomem pointers for MPP functions
arm: plat-orion: use void __iomem pointers for time functions
arm: plat-orion: use void __iomem pointers for addr-map functions
arm: plat-orion: introduce PLAT_ORION_LEGACY hidden config option
arm: plat-orion: make bridge_virt_base non-const to support DT use case
arm: mvebu: add basic address decoding support to Armada 370/XP
arm: mvebu: add address decoding controller to the DT
arch/arm/Kconfig | 13 ++-
arch/arm/boot/dts/armada-370-xp.dtsi | 5 +
arch/arm/mach-dove/common.c | 8 +-
arch/arm/mach-dove/include/mach/bridge-regs.h | 16 ++--
arch/arm/mach-dove/include/mach/dove.h | 130 ++++++++++----------
arch/arm/mach-dove/irq.c | 10 +-
arch/arm/mach-dove/pcie.c | 6 +-
arch/arm/mach-kirkwood/addr-map.c | 3 +-
arch/arm/mach-kirkwood/common.c | 12 +-
arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 20 ++--
arch/arm/mach-kirkwood/include/mach/kirkwood.h | 116 +++++++++---------
arch/arm/mach-kirkwood/irq.c | 9 +-
arch/arm/mach-kirkwood/pcie.c | 12 +-
arch/arm/mach-kirkwood/ts41x-setup.c | 3 +-
arch/arm/mach-mv78xx0/addr-map.c | 6 +-
arch/arm/mach-mv78xx0/common.c | 6 +-
arch/arm/mach-mv78xx0/include/mach/bridge-regs.h | 12 +-
arch/arm/mach-mv78xx0/include/mach/mv78xx0.h | 88 +++++++-------
arch/arm/mach-mv78xx0/irq.c | 9 +-
arch/arm/mach-mv78xx0/pcie.c | 12 +-
arch/arm/mach-mvebu/Makefile | 2 +-
arch/arm/mach-mvebu/addr-map.c | 134 +++++++++++++++++++++
arch/arm/mach-mvebu/armada-370-xp.c | 2 +-
arch/arm/mach-mvebu/include/mach/armada-370-xp.h | 2 +-
arch/arm/mach-orion5x/addr-map.c | 3 +-
arch/arm/mach-orion5x/common.c | 8 +-
arch/arm/mach-orion5x/dns323-setup.c | 2 +-
arch/arm/mach-orion5x/include/mach/bridge-regs.h | 20 ++--
arch/arm/mach-orion5x/include/mach/orion5x.h | 60 +++++-----
arch/arm/mach-orion5x/irq.c | 5 +-
arch/arm/mach-orion5x/pci.c | 6 +-
arch/arm/plat-orion/Makefile | 9 +-
arch/arm/plat-orion/addr-map.c | 11 +-
arch/arm/plat-orion/common.c | 12 +-
arch/arm/plat-orion/include/plat/addr-map.h | 4 +-
arch/arm/plat-orion/include/plat/common.h | 8 +-
arch/arm/plat-orion/include/plat/mpp.h | 2 +-
arch/arm/plat-orion/include/plat/time.h | 4 +-
arch/arm/plat-orion/mpp.c | 6 +-
arch/arm/plat-orion/time.c | 8 +-
40 files changed, 474 insertions(+), 330 deletions(-)
create mode 100644 arch/arm/mach-mvebu/addr-map.c
^ permalink raw reply [flat|nested] 27+ messages in thread* [GIT PULL V3 1/5] ARM: Kirkwood: address decoding change for v3.7
2012-09-21 19:41 ` [GIT PULL V3 1/5] ARM: Kirkwood: address decoding change " Jason Cooper
@ 2012-09-22 5:29 ` Olof Johansson
2012-09-22 7:30 ` Arnd Bergmann
2012-09-22 8:20 ` Thomas Petazzoni
0 siblings, 2 replies; 27+ messages in thread
From: Olof Johansson @ 2012-09-22 5:29 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Sep 21, 2012 at 03:41:41PM -0400, Jason Cooper wrote:
> The following changes since commit 55d512e245bc7699a8800e23df1a24195dd08217:
>
> Linux 3.6-rc5 (2012-09-08 16:43:45 -0700)
>
> are available in the git repository at:
> git://git.infradead.org/users/jcooper/linux.git kirkwood/addr_decode
>
> Thomas Petazzoni (17):
> arm: mach-dove: use plus instead of or for address definitions
> arm: mach-kirkwood: use plus instead of or for address definitions
> arm: mach-mv78xx0: use plus instead of or for address definitions
> arm: mach-orion5x: use plus instead of or for address definitions
> arm: mach-dove: use IOMEM() for base address definitions
> arm: mach-kirkwood: use IOMEM() for base address definitions
> arm: mach-mv78xx0: use IOMEM() for base address definitions
> arm: mach-orion5x: use IOMEM() for base address definitions
> arm: mach-mvebu: use IOMEM() for base address definitions
> arm: plat-orion: use void __iomem pointers for UART registration functions
> arm: plat-orion: use void __iomem pointers for MPP functions
> arm: plat-orion: use void __iomem pointers for time functions
> arm: plat-orion: use void __iomem pointers for addr-map functions
> arm: plat-orion: introduce PLAT_ORION_LEGACY hidden config option
> arm: plat-orion: make bridge_virt_base non-const to support DT use case
> arm: mvebu: add basic address decoding support to Armada 370/XP
> arm: mvebu: add address decoding controller to the DT
Hi,
This branch has pretty massive merge conflicts with cleanup/io-pci and other
branches, in particular due to the large number of conflicting cleanup patches.
It'd be better to focus on just the address decoding pieces in this branch, and
move the cleanups to a separate branch. Given the state of affairs w.r.t.
conflicts for the cleanups, saving those for 3.8 might be a better idea.
I mentioned in one of the other comments to a patch in this series that
I was going to pull this in as staging/* and get linux-next coverage,
but these conflicts are more than what I want to deal with now -- so
I'll hold off pulling these in after all.
-Olof
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL V3 1/5] ARM: Kirkwood: address decoding change for v3.7
2012-09-22 5:29 ` Olof Johansson
@ 2012-09-22 7:30 ` Arnd Bergmann
2012-09-22 8:20 ` Thomas Petazzoni
1 sibling, 0 replies; 27+ messages in thread
From: Arnd Bergmann @ 2012-09-22 7:30 UTC (permalink / raw)
To: linux-arm-kernel
On Saturday 22 September 2012, Olof Johansson wrote:
> This branch has pretty massive merge conflicts with cleanup/io-pci and other
> branches, in particular due to the large number of conflicting cleanup patches.
>
> It'd be better to focus on just the address decoding pieces in this branch, and
> move the cleanups to a separate branch. Given the state of affairs w.r.t.
> conflicts for the cleanups, saving those for 3.8 might be a better idea.
>
> I mentioned in one of the other comments to a patch in this series that
> I was going to pull this in as staging/* and get linux-next coverage,
> but these conflicts are more than what I want to deal with now -- so
> I'll hold off pulling these in after all.
I think the branch is needed though, to avoid lots of build warnings
when the changes to asm/io.h from Russell's tree hit mainline. I did similar
patches for most of the other platforms but left out the ones that I knew
Thomas was already working on.
Arnd
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL V3 1/5] ARM: Kirkwood: address decoding change for v3.7
2012-09-22 5:29 ` Olof Johansson
2012-09-22 7:30 ` Arnd Bergmann
@ 2012-09-22 8:20 ` Thomas Petazzoni
1 sibling, 0 replies; 27+ messages in thread
From: Thomas Petazzoni @ 2012-09-22 8:20 UTC (permalink / raw)
To: linux-arm-kernel
Dear Olof Johansson,
On Fri, 21 Sep 2012 22:29:04 -0700, Olof Johansson wrote:
> This branch has pretty massive merge conflicts with cleanup/io-pci
> and other branches, in particular due to the large number of
> conflicting cleanup patches.
>
> It'd be better to focus on just the address decoding pieces in this
> branch, and move the cleanups to a separate branch. Given the state
> of affairs w.r.t. conflicts for the cleanups, saving those for 3.8
> might be a better idea.
>
> I mentioned in one of the other comments to a patch in this series
> that I was going to pull this in as staging/* and get linux-next
> coverage, but these conflicts are more than what I want to deal with
> now -- so I'll hold off pulling these in after all.
This is really surprising. Those cleanups were explicitly requested by
Arnd Bergmann during the review process of my address decoding patch
set. The earlier version of this patch set was only doing address
decoding changes, not the IOMEM() cleanup. And Arnd requested the
IOMEM() cleanup to be done as a pre-requisite to the address decoding
changes. I've therefore spent two days last week doing these cleanups
and retesting the address decoding changes, and now you're telling us
exactly the opposite of what Arnd said two weeks ago?
I'm sorry but that doesn't really fair here.
Best regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL V3 2/5] ARM: Kirkwood: DT changes for v3.7
2012-08-29 0:11 [GIT PULL] Kirkwood: board changes for v3.7 Jason Cooper
` (6 preceding siblings ...)
2012-09-21 19:41 ` [GIT PULL V3 1/5] ARM: Kirkwood: address decoding change " Jason Cooper
@ 2012-09-21 19:46 ` Jason Cooper
2012-09-22 5:11 ` Olof Johansson
2012-09-21 19:48 ` [GIT PULL V3 3/5] ARM: Kirkwood: board " Jason Cooper
` (2 subsequent siblings)
10 siblings, 1 reply; 27+ messages in thread
From: Jason Cooper @ 2012-09-21 19:46 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 5b40baee4a39d96d4d6a48a2b2383982912c429b:
arm: mvebu: add address decoding controller to the DT (2012-09-21 18:05:29 +0000)
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git kirkwood/dt
Andrew Lunn (3):
ARM: Kirkwood: ehci-orion: Add device tree binding
ARM: Kirkwood: Convert all DT boards to EHCI via DT.
Crypto: CESA: Add support for DT based instantiation.
Arnaud Patard (2):
ARM: Kirkwood: Describe iconnect keys in DT.
ARM: Kirkwood: Describe iconnect nand in DT.
Jamie Lentin (2):
hwmon: Add devicetree bindings to gpio-fan
ARM: kirkwood: Use devicetree to define DNS-32[05] fan
Sebastian Hesselbarth (3):
pinctrl: mvebu: pinctrl driver core
pinctrl: mvebu: dove pinctrl driver
pinctrl: mvebu: kirkwood pinctrl driver
Thomas Petazzoni (12):
pinctrl: mvebu: add pinctrl driver for Armada 370
pinctrl: mvebu: add pinctrl driver for Armada XP
ARM: mvebu: Add pinctrl support to Armada XP SoCs
ARM: mvebu: Add pinctrl support to Armada 370 SoC
ARM: mvebu: adjust Armada XP evaluation board DTS
arm: mvebu: split Kconfig options for Armada 370 and XP
arm: mvebu: select the pinctrl drivers for Armada 370 and Armada XP platforms
gpio: introduce gpio-mvebu driver for Marvell SoCs
Documentation: add description of DT binding for the gpio-mvebu driver
arm: mvebu: use GPIO support now that a driver is available
arm: mvebu: add DT information for GPIO banks on Armada 370 and XP
arm: mvebu: add gpio support in defconfig
.../devicetree/bindings/crypto/mv_cesa.txt | 20 +
.../devicetree/bindings/gpio/gpio-fan.txt | 25 +
.../devicetree/bindings/gpio/gpio-mvebu.txt | 53 ++
.../pinctrl/marvell,armada-370-pinctrl.txt | 95 +++
.../bindings/pinctrl/marvell,armada-xp-pinctrl.txt | 100 +++
.../bindings/pinctrl/marvell,dove-pinctrl.txt | 72 ++
.../bindings/pinctrl/marvell,kirkwood-pinctrl.txt | 279 ++++++++
.../bindings/pinctrl/marvell,mvebu-pinctrl.txt | 46 ++
.../devicetree/bindings/usb/ehci-orion.txt | 19 +
arch/arm/Kconfig | 2 +
arch/arm/boot/dts/armada-370.dtsi | 44 ++
arch/arm/boot/dts/armada-xp-db.dts | 4 +-
arch/arm/boot/dts/armada-xp-mv78230.dtsi | 57 ++
arch/arm/boot/dts/armada-xp-mv78260.dtsi | 70 ++
arch/arm/boot/dts/armada-xp-mv78460.dtsi | 70 ++
arch/arm/boot/dts/kirkwood-dnskw.dtsi | 10 +
arch/arm/boot/dts/kirkwood-iconnect.dts | 50 ++-
arch/arm/boot/dts/kirkwood.dtsi | 20 +-
arch/arm/configs/mvebu_defconfig | 2 +
arch/arm/mach-kirkwood/board-dnskw.c | 27 -
arch/arm/mach-kirkwood/board-dreamplug.c | 1 -
arch/arm/mach-kirkwood/board-dt.c | 3 +-
arch/arm/mach-kirkwood/board-goflexnet.c | 1 -
arch/arm/mach-kirkwood/board-ib62x0.c | 1 -
arch/arm/mach-kirkwood/board-iconnect.c | 49 --
arch/arm/mach-kirkwood/board-lsxl.c | 1 -
arch/arm/mach-kirkwood/board-ts219.c | 1 -
arch/arm/mach-mvebu/Kconfig | 18 +-
arch/arm/mach-mvebu/include/mach/gpio.h | 1 +
drivers/crypto/mv_cesa.c | 17 +-
drivers/gpio/Kconfig | 6 +
drivers/gpio/Makefile | 1 +
drivers/gpio/gpio-mvebu.c | 679 ++++++++++++++++++
drivers/hwmon/gpio-fan.c | 120 ++++
drivers/pinctrl/Kconfig | 22 +
drivers/pinctrl/Makefile | 5 +
drivers/pinctrl/pinctrl-armada-370.c | 421 +++++++++++
drivers/pinctrl/pinctrl-armada-xp.c | 468 ++++++++++++
drivers/pinctrl/pinctrl-dove.c | 620 ++++++++++++++++
drivers/pinctrl/pinctrl-kirkwood.c | 472 ++++++++++++
drivers/pinctrl/pinctrl-mvebu.c | 754 ++++++++++++++++++++
drivers/pinctrl/pinctrl-mvebu.h | 192 +++++
drivers/usb/host/ehci-orion.c | 59 ++-
43 files changed, 4883 insertions(+), 94 deletions(-)
create mode 100644 Documentation/devicetree/bindings/crypto/mv_cesa.txt
create mode 100644 Documentation/devicetree/bindings/gpio/gpio-fan.txt
create mode 100644 Documentation/devicetree/bindings/gpio/gpio-mvebu.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,dove-pinctrl.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,mvebu-pinctrl.txt
create mode 100644 Documentation/devicetree/bindings/usb/ehci-orion.txt
create mode 100644 arch/arm/boot/dts/armada-xp-mv78230.dtsi
create mode 100644 arch/arm/boot/dts/armada-xp-mv78260.dtsi
create mode 100644 arch/arm/boot/dts/armada-xp-mv78460.dtsi
create mode 100644 arch/arm/mach-mvebu/include/mach/gpio.h
create mode 100644 drivers/gpio/gpio-mvebu.c
create mode 100644 drivers/pinctrl/pinctrl-armada-370.c
create mode 100644 drivers/pinctrl/pinctrl-armada-xp.c
create mode 100644 drivers/pinctrl/pinctrl-dove.c
create mode 100644 drivers/pinctrl/pinctrl-kirkwood.c
create mode 100644 drivers/pinctrl/pinctrl-mvebu.c
create mode 100644 drivers/pinctrl/pinctrl-mvebu.h
^ permalink raw reply [flat|nested] 27+ messages in thread* [GIT PULL V3 2/5] ARM: Kirkwood: DT changes for v3.7
2012-09-21 19:46 ` [GIT PULL V3 2/5] ARM: Kirkwood: DT changes " Jason Cooper
@ 2012-09-22 5:11 ` Olof Johansson
2012-09-22 13:21 ` Jason Cooper
0 siblings, 1 reply; 27+ messages in thread
From: Olof Johansson @ 2012-09-22 5:11 UTC (permalink / raw)
To: linux-arm-kernel
Hi Jason,
On Fri, Sep 21, 2012 at 03:46:29PM -0400, Jason Cooper wrote:
> The following changes since commit 5b40baee4a39d96d4d6a48a2b2383982912c429b:
>
> arm: mvebu: add address decoding controller to the DT (2012-09-21 18:05:29 +0000)
>
> are available in the git repository at:
> git://git.infradead.org/users/jcooper/linux.git kirkwood/dt
Looking at this branch, it's much more than just device tree updates.
It introduces the pinctrl driver (and bindings), and the gpio driver (and
bindings). I think it would make more sense to break those two out to separate
topics, and keep the generic DT updates in this branch.
Also, see my comment on the EHCI binding patch. I wasn't going to ask you to
respin the branch to fix/drop that on its own, but if you do rebuild and split
this branch up you might as well delay those patches until the binding has been
fixed.
I'll pull in your branches under staging/* for now so they can get linux-next
coverage until the "real" branches come in.
-Olof
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL V3 2/5] ARM: Kirkwood: DT changes for v3.7
2012-09-22 5:11 ` Olof Johansson
@ 2012-09-22 13:21 ` Jason Cooper
0 siblings, 0 replies; 27+ messages in thread
From: Jason Cooper @ 2012-09-22 13:21 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Sep 21, 2012 at 10:11:58PM -0700, Olof Johansson wrote:
> Hi Jason,
>
> On Fri, Sep 21, 2012 at 03:46:29PM -0400, Jason Cooper wrote:
> > The following changes since commit 5b40baee4a39d96d4d6a48a2b2383982912c429b:
> >
> > arm: mvebu: add address decoding controller to the DT (2012-09-21 18:05:29 +0000)
> >
> > are available in the git repository at:
> > git://git.infradead.org/users/jcooper/linux.git kirkwood/dt
>
> Looking at this branch, it's much more than just device tree updates.
Ok, my thinking was they (pinctrl and gpio) were devicetree-only
drivers, see below.
> It introduces the pinctrl driver (and bindings), and the gpio driver (and
> bindings). I think it would make more sense to break those two out to separate
> topics, and keep the generic DT updates in this branch.
>
> Also, see my comment on the EHCI binding patch. I wasn't going to ask you to
> respin the branch to fix/drop that on its own, but if you do rebuild and split
> this branch up you might as well delay those patches until the binding has been
> fixed.
Ok. I'll split out pinctrl and gpio into a kirkwood/drivers, leave the
rest in /dt, and drop the ehci changes. /drivers will still depend on
/addr_decode, once you, Arnd, and Thomas work that out. /dt should have
no deps then.
/cleanup will now depend only on /boards if we're dropping ehci for now.
/defconfig will still only depend on /boards.
/platform_data will still depend on everything kirkwood/*.
So, I take it /boards is ok?
> I'll pull in your branches under staging/* for now so they can get linux-next
> coverage until the "real" branches come in.
Okay, thanks.
thx,
Jason.
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL V3 3/5] ARM: Kirkwood: board changes for v3.7
2012-08-29 0:11 [GIT PULL] Kirkwood: board changes for v3.7 Jason Cooper
` (7 preceding siblings ...)
2012-09-21 19:46 ` [GIT PULL V3 2/5] ARM: Kirkwood: DT changes " Jason Cooper
@ 2012-09-21 19:48 ` Jason Cooper
2012-09-21 19:57 ` [GIT PULL V3 4/5] ARM: Kirkwood: cleanup " Jason Cooper
2012-09-21 19:58 ` [GIT PULL V3 5/5] ARM: Kirkwood: defconfig changes " Jason Cooper
10 siblings, 0 replies; 27+ messages in thread
From: Jason Cooper @ 2012-09-21 19:48 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 55d512e245bc7699a8800e23df1a24195dd08217:
Linux 3.6-rc5 (2012-09-08 16:43:45 -0700)
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git kirkwood/boards
Alan M Butler (1):
ARM: Kirkwood: Iomega ix2-200 DT support
Russell King (1):
ARM: Dove: allow PCI to be disabled
Sebastian Hesselbarth (8):
ARM: kirkwood: DT board setup for Seagate FreeAgent Dockstar
ARM: kirkwood: DT descriptor for Seagate FreeAgent Dockstar
ARM: dove: unify clock setup
ARM: dove: add clock gating control
ARM: dove: add crypto engine
ARM: dove: add device tree based machine descriptor
ARM: dove: add device tree descriptors
ARM: dove: SolidRun CuBox DT
Thomas Petazzoni (1):
arm: add documentation describing Marvell families of SoC
Valentin Longchamp (1):
ARM: initial DTS support for km_kirkwood
Documentation/arm/Marvell/README | 232 +++++++++++++++++++++++++
arch/arm/Kconfig | 3 +-
arch/arm/boot/dts/dove-cm-a510.dts | 38 ++++
arch/arm/boot/dts/dove-cubox.dts | 42 +++++
arch/arm/boot/dts/dove-dove-db.dts | 38 ++++
arch/arm/boot/dts/dove.dtsi | 143 +++++++++++++++
arch/arm/boot/dts/kirkwood-dockstar.dts | 57 ++++++
arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 105 +++++++++++
arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 29 +++
arch/arm/mach-dove/Kconfig | 7 +
arch/arm/mach-dove/Makefile | 4 +-
arch/arm/mach-dove/Makefile.boot | 4 +
arch/arm/mach-dove/common.c | 154 +++++++++++++++--
arch/arm/mach-dove/common.h | 4 +
arch/arm/mach-dove/include/mach/pm.h | 54 ++++--
arch/arm/mach-kirkwood/Kconfig | 21 +++
arch/arm/mach-kirkwood/Makefile | 3 +
arch/arm/mach-kirkwood/Makefile.boot | 3 +
arch/arm/mach-kirkwood/board-dockstar.c | 61 +++++++
arch/arm/mach-kirkwood/board-dt.c | 12 ++
arch/arm/mach-kirkwood/board-iomega_ix2_200.c | 57 ++++++
arch/arm/mach-kirkwood/board-km_kirkwood.c | 57 ++++++
arch/arm/mach-kirkwood/common.h | 18 ++
23 files changed, 1113 insertions(+), 33 deletions(-)
create mode 100644 Documentation/arm/Marvell/README
create mode 100644 arch/arm/boot/dts/dove-cm-a510.dts
create mode 100644 arch/arm/boot/dts/dove-cubox.dts
create mode 100644 arch/arm/boot/dts/dove-dove-db.dts
create mode 100644 arch/arm/boot/dts/dove.dtsi
create mode 100644 arch/arm/boot/dts/kirkwood-dockstar.dts
create mode 100644 arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
create mode 100644 arch/arm/boot/dts/kirkwood-km_kirkwood.dts
create mode 100644 arch/arm/mach-kirkwood/board-dockstar.c
create mode 100644 arch/arm/mach-kirkwood/board-iomega_ix2_200.c
create mode 100644 arch/arm/mach-kirkwood/board-km_kirkwood.c
^ permalink raw reply [flat|nested] 27+ messages in thread* [GIT PULL V3 4/5] ARM: Kirkwood: cleanup for v3.7
2012-08-29 0:11 [GIT PULL] Kirkwood: board changes for v3.7 Jason Cooper
` (8 preceding siblings ...)
2012-09-21 19:48 ` [GIT PULL V3 3/5] ARM: Kirkwood: board " Jason Cooper
@ 2012-09-21 19:57 ` Jason Cooper
2012-09-22 1:48 ` [GIT PULL V4 4a/5] " Jason Cooper
` (2 more replies)
2012-09-21 19:58 ` [GIT PULL V3 5/5] ARM: Kirkwood: defconfig changes " Jason Cooper
10 siblings, 3 replies; 27+ messages in thread
From: Jason Cooper @ 2012-09-21 19:57 UTC (permalink / raw)
To: linux-arm-kernel
NOTE: This branch depends on both kirkwood/boards and kirkwood/dt (and,
by extension, kirkwood/addr_decode). Some of that got pulled into this
summary (kirkwood/boards). Is this correct? Sould I be basing the
pullreq on v3.6-rc5? That would summarize all three branches. Doesn't
seem as useful.
If it isn't clear, please ask.
thx,
Jason.
The following changes since commit 81d143f47f12368ab4be0cde10aaf379994f3594:
ARM: kirkwood: Use devicetree to define DNS-32[05] fan (2012-09-21 18:27:09 +0000)
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git kirkwood/cleanup
Alan M Butler (1):
ARM: Kirkwood: Iomega ix2-200 DT support
Jamie Lentin (1):
ARM: kirkwood: Trim excess #includes in board-dnskw.c
Jason Cooper (4):
Merge branch 'kirkwood/boards' into kirkwood/cleanup
ARM: Kirkwood: ehci now specified in kirkwood.dtsi. remove legacy platform init
ARM: Kirkwood: board-dockstar: use linux/platform_data/mvsdio.h instead of plat/mvsdio.h
ARM: Kirkwood: use linux/platform_data/mv643xx.h instead of linux/mv643xx.h
Russell King (1):
ARM: Dove: allow PCI to be disabled
Sebastian Hesselbarth (8):
ARM: kirkwood: DT board setup for Seagate FreeAgent Dockstar
ARM: kirkwood: DT descriptor for Seagate FreeAgent Dockstar
ARM: dove: unify clock setup
ARM: dove: add clock gating control
ARM: dove: add crypto engine
ARM: dove: add device tree based machine descriptor
ARM: dove: add device tree descriptors
ARM: dove: SolidRun CuBox DT
Thomas Petazzoni (9):
arm: add documentation describing Marvell families of SoC
sound: kirkwood: remove useless <plat/audio.h> include
sound: kirkwood: move <plat/audio.h> to <linux/platform_data/kirkwood-audio.h>
usb: ehci-orion: move <plat/ehci-orion.h> to <linux/platform_data/ehci-orion.h>
mmc: mvsdio: move <plat/mvsdio.h> to <linux/platform_data/mvsdio.h>
dma: mv_xor: move <plat/mv_xor.h> to <linux/platform_data/mv_xor.h>
mtd: orion_nand: move <plat/orion_nand.h> to <linux/platform_data/orion_nand.h>
i2c: mv643xx: move <linux/mv643xx_i2c.h> to <linux/platform_data/mv643xx_i2c.h>
net: mv643xx_eth: move <linux/mv643xx_eth.h> to <linux/platform_data/mv643xx_eth.h>
Valentin Longchamp (1):
ARM: initial DTS support for km_kirkwood
Documentation/arm/Marvell/README | 232 ++++++++++++++++++++
arch/arm/Kconfig | 3 +-
arch/arm/boot/dts/dove-cm-a510.dts | 38 ++++
arch/arm/boot/dts/dove-cubox.dts | 42 ++++
arch/arm/boot/dts/dove-dove-db.dts | 38 ++++
arch/arm/boot/dts/dove.dtsi | 143 ++++++++++++
arch/arm/boot/dts/kirkwood-dockstar.dts | 57 +++++
arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 105 +++++++++
arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 29 +++
arch/arm/mach-dove/Kconfig | 7 +
arch/arm/mach-dove/Makefile | 4 +-
arch/arm/mach-dove/Makefile.boot | 4 +
arch/arm/mach-dove/cm-a510.c | 2 +-
arch/arm/mach-dove/common.c | 155 ++++++++++++-
arch/arm/mach-dove/common.h | 4 +
arch/arm/mach-dove/dove-db-setup.c | 2 +-
arch/arm/mach-dove/include/mach/pm.h | 54 +++--
arch/arm/mach-kirkwood/Kconfig | 21 ++
arch/arm/mach-kirkwood/Makefile | 3 +
arch/arm/mach-kirkwood/Makefile.boot | 3 +
arch/arm/mach-kirkwood/board-dnskw.c | 11 +-
arch/arm/mach-kirkwood/board-dockstar.c | 60 +++++
arch/arm/mach-kirkwood/board-dreamplug.c | 4 +-
arch/arm/mach-kirkwood/board-dt.c | 12 +
arch/arm/mach-kirkwood/board-goflexnet.c | 4 +-
arch/arm/mach-kirkwood/board-ib62x0.c | 2 +-
arch/arm/mach-kirkwood/board-iconnect.c | 3 +-
arch/arm/mach-kirkwood/board-iomega_ix2_200.c | 55 +++++
arch/arm/mach-kirkwood/board-km_kirkwood.c | 56 +++++
arch/arm/mach-kirkwood/board-lsxl.c | 2 +-
arch/arm/mach-kirkwood/board-ts219.c | 2 +-
arch/arm/mach-kirkwood/common.c | 12 +-
arch/arm/mach-kirkwood/common.h | 18 ++
arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 +-
arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 4 +-
arch/arm/mach-kirkwood/dockstar-setup.c | 4 +-
arch/arm/mach-kirkwood/guruplug-setup.c | 4 +-
arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 2 +-
arch/arm/mach-kirkwood/netspace_v2-setup.c | 2 +-
arch/arm/mach-kirkwood/netxbig_v2-setup.c | 2 +-
arch/arm/mach-kirkwood/openrd-setup.c | 4 +-
arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 +-
arch/arm/mach-kirkwood/rd88f6281-setup.c | 4 +-
arch/arm/mach-kirkwood/sheevaplug-setup.c | 4 +-
arch/arm/mach-kirkwood/t5325-setup.c | 2 +-
arch/arm/mach-kirkwood/ts219-setup.c | 2 +-
arch/arm/mach-kirkwood/ts41x-setup.c | 2 +-
arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 2 +-
arch/arm/mach-mv78xx0/common.c | 4 +-
arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 2 +-
arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 2 +-
arch/arm/mach-orion5x/common.c | 6 +-
arch/arm/mach-orion5x/d2net-setup.c | 2 +-
arch/arm/mach-orion5x/db88f5281-setup.c | 4 +-
arch/arm/mach-orion5x/dns323-setup.c | 2 +-
arch/arm/mach-orion5x/edmini_v2-setup.c | 2 +-
arch/arm/mach-orion5x/kurobox_pro-setup.c | 4 +-
arch/arm/mach-orion5x/ls-chl-setup.c | 2 +-
arch/arm/mach-orion5x/ls_hgl-setup.c | 2 +-
arch/arm/mach-orion5x/lsmini-setup.c | 2 +-
arch/arm/mach-orion5x/mss2-setup.c | 2 +-
arch/arm/mach-orion5x/mv2120-setup.c | 2 +-
arch/arm/mach-orion5x/net2big-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f5182-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 2 +-
arch/arm/mach-orion5x/terastation_pro2-setup.c | 2 +-
arch/arm/mach-orion5x/ts209-setup.c | 2 +-
arch/arm/mach-orion5x/ts409-setup.c | 2 +-
arch/arm/mach-orion5x/ts78xx-setup.c | 2 +-
arch/arm/mach-orion5x/tsx09-common.c | 2 +-
arch/arm/mach-orion5x/wnr854t-setup.c | 2 +-
arch/arm/mach-orion5x/wrt350n-v2-setup.c | 2 +-
arch/arm/plat-orion/common.c | 8 +-
arch/arm/plat-orion/include/plat/audio.h | 7 -
arch/arm/plat-orion/include/plat/common.h | 2 +-
drivers/dma/mv_xor.c | 2 +-
drivers/i2c/busses/i2c-mv64xxx.c | 2 +-
drivers/mmc/host/mvsdio.c | 2 +-
drivers/mtd/nand/orion_nand.c | 2 +-
drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +-
drivers/usb/host/ehci-orion.c | 2 +-
include/linux/mv643xx.h | 4 +-
.../linux/platform_data}/ehci-orion.h | 6 +-
include/linux/platform_data/kirkwood-audio.h | 7 +
include/linux/{ => platform_data}/mv643xx_eth.h | 4 +-
include/linux/{ => platform_data}/mv643xx_i2c.h | 4 +-
.../plat => include/linux/platform_data}/mv_xor.h | 6 +-
.../plat => include/linux/platform_data}/mvsdio.h | 6 +-
.../linux/platform_data}/orion_nand.h | 6 +-
sound/soc/kirkwood/kirkwood-i2s.c | 2 +-
sound/soc/kirkwood/kirkwood-openrd.c | 1 -
sound/soc/kirkwood/kirkwood-t5325.c | 1 -
94 files changed, 1212 insertions(+), 155 deletions(-)
create mode 100644 Documentation/arm/Marvell/README
create mode 100644 arch/arm/boot/dts/dove-cm-a510.dts
create mode 100644 arch/arm/boot/dts/dove-cubox.dts
create mode 100644 arch/arm/boot/dts/dove-dove-db.dts
create mode 100644 arch/arm/boot/dts/dove.dtsi
create mode 100644 arch/arm/boot/dts/kirkwood-dockstar.dts
create mode 100644 arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
create mode 100644 arch/arm/boot/dts/kirkwood-km_kirkwood.dts
create mode 100644 arch/arm/mach-kirkwood/board-dockstar.c
create mode 100644 arch/arm/mach-kirkwood/board-iomega_ix2_200.c
create mode 100644 arch/arm/mach-kirkwood/board-km_kirkwood.c
delete mode 100644 arch/arm/plat-orion/include/plat/audio.h
rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/ehci-orion.h (78%)
create mode 100644 include/linux/platform_data/kirkwood-audio.h
rename include/linux/{ => platform_data}/mv643xx_eth.h (96%)
rename include/linux/{ => platform_data}/mv643xx_i2c.h (89%)
rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/mv_xor.h (77%)
rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/mvsdio.h (77%)
rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/orion_nand.h (82%)
^ permalink raw reply [flat|nested] 27+ messages in thread* [GIT PULL V4 4a/5] ARM: Kirkwood: cleanup for v3.7
2012-09-21 19:57 ` [GIT PULL V3 4/5] ARM: Kirkwood: cleanup " Jason Cooper
@ 2012-09-22 1:48 ` Jason Cooper
2012-09-22 1:53 ` [GIT PULL V4 4b/5] ARM: Kirkwood: platform_data " Jason Cooper
2012-09-22 5:17 ` [GIT PULL V3 4/5] ARM: Kirkwood: cleanup " Olof Johansson
2 siblings, 0 replies; 27+ messages in thread
From: Jason Cooper @ 2012-09-22 1:48 UTC (permalink / raw)
To: linux-arm-kernel
Arnd, Olof,
Of course, the best ideas hit after you relax. I am sending a V4 of
this pullrq split into two.
* This does not affect the other branches at all
* this separates out the platform_data conversion for kirkwood so that
if it conflicts with others, you can drop it easily.
So, this pullrq (a) is just cleanup. pullrq (b) is platform_data only
and nothing else in the series of pullrq's depends on it. Use it, drop
it, doesn't matter. I sincerely hope that helps.
thx,
Jason.
The following changes since commit 68fa6eb9d0dd41b1bb72bade6f6307193b18fbd1:
Merge branch 'kirkwood/boards' into kirkwood/cleanup (2012-09-21 18:54:20 +0000)
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git kirkwood/cleanup
Jamie Lentin (1):
ARM: kirkwood: Trim excess #includes in board-dnskw.c
Jason Cooper (1):
ARM: Kirkwood: ehci now specified in kirkwood.dtsi. remove legacy platform init
arch/arm/mach-kirkwood/board-dnskw.c | 9 ---------
arch/arm/mach-kirkwood/board-dockstar.c | 1 -
arch/arm/mach-kirkwood/board-iomega_ix2_200.c | 2 --
arch/arm/mach-kirkwood/board-km_kirkwood.c | 1 -
4 files changed, 0 insertions(+), 13 deletions(-)
^ permalink raw reply [flat|nested] 27+ messages in thread* [GIT PULL V4 4b/5] ARM: Kirkwood: platform_data for v3.7
2012-09-21 19:57 ` [GIT PULL V3 4/5] ARM: Kirkwood: cleanup " Jason Cooper
2012-09-22 1:48 ` [GIT PULL V4 4a/5] " Jason Cooper
@ 2012-09-22 1:53 ` Jason Cooper
2012-09-22 5:17 ` [GIT PULL V3 4/5] ARM: Kirkwood: cleanup " Olof Johansson
2 siblings, 0 replies; 27+ messages in thread
From: Jason Cooper @ 2012-09-22 1:53 UTC (permalink / raw)
To: linux-arm-kernel
Arnd, Olof,
Here is the platform_data branch for kirkwood. Nothing I've sent
depends on it. So, if it's useful, great. If it causes conflicts with
other conversion work, drop it.
hth,
Jason.
The following changes since commit f161905a29aff0de6f2ed39d5dae6b4fde402730:
ARM: Kirkwood: ehci now specified in kirkwood.dtsi. remove legacy platform init (2012-09-21 18:55:57 +0000)
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git kirkwood/platform_data
Jason Cooper (2):
ARM: Kirkwood: board-dockstar: use linux/platform_data/mvsdio.h instead of plat/mvsdio.h
ARM: Kirkwood: use linux/platform_data/mv643xx.h instead of linux/mv643xx.h
Thomas Petazzoni (8):
sound: kirkwood: remove useless <plat/audio.h> include
sound: kirkwood: move <plat/audio.h> to <linux/platform_data/kirkwood-audio.h>
usb: ehci-orion: move <plat/ehci-orion.h> to <linux/platform_data/ehci-orion.h>
mmc: mvsdio: move <plat/mvsdio.h> to <linux/platform_data/mvsdio.h>
dma: mv_xor: move <plat/mv_xor.h> to <linux/platform_data/mv_xor.h>
mtd: orion_nand: move <plat/orion_nand.h> to <linux/platform_data/orion_nand.h>
i2c: mv643xx: move <linux/mv643xx_i2c.h> to <linux/platform_data/mv643xx_i2c.h>
net: mv643xx_eth: move <linux/mv643xx_eth.h> to <linux/platform_data/mv643xx_eth.h>
arch/arm/mach-dove/cm-a510.c | 2 +-
arch/arm/mach-dove/common.c | 3 +--
arch/arm/mach-dove/dove-db-setup.c | 2 +-
arch/arm/mach-kirkwood/board-dnskw.c | 2 +-
arch/arm/mach-kirkwood/board-dockstar.c | 4 ++--
arch/arm/mach-kirkwood/board-dreamplug.c | 4 ++--
arch/arm/mach-kirkwood/board-goflexnet.c | 4 ++--
arch/arm/mach-kirkwood/board-ib62x0.c | 2 +-
arch/arm/mach-kirkwood/board-iconnect.c | 3 ++-
arch/arm/mach-kirkwood/board-iomega_ix2_200.c | 2 +-
arch/arm/mach-kirkwood/board-km_kirkwood.c | 2 +-
arch/arm/mach-kirkwood/board-lsxl.c | 2 +-
arch/arm/mach-kirkwood/board-ts219.c | 2 +-
arch/arm/mach-kirkwood/common.c | 12 ++++++------
arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 +-
arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 4 ++--
arch/arm/mach-kirkwood/dockstar-setup.c | 4 ++--
arch/arm/mach-kirkwood/guruplug-setup.c | 4 ++--
arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 2 +-
arch/arm/mach-kirkwood/netspace_v2-setup.c | 2 +-
arch/arm/mach-kirkwood/netxbig_v2-setup.c | 2 +-
arch/arm/mach-kirkwood/openrd-setup.c | 4 ++--
arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 +-
arch/arm/mach-kirkwood/rd88f6281-setup.c | 4 ++--
arch/arm/mach-kirkwood/sheevaplug-setup.c | 4 ++--
arch/arm/mach-kirkwood/t5325-setup.c | 2 +-
arch/arm/mach-kirkwood/ts219-setup.c | 2 +-
arch/arm/mach-kirkwood/ts41x-setup.c | 2 +-
arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 2 +-
arch/arm/mach-mv78xx0/common.c | 4 ++--
arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 2 +-
arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 2 +-
arch/arm/mach-orion5x/common.c | 6 +++---
arch/arm/mach-orion5x/d2net-setup.c | 2 +-
arch/arm/mach-orion5x/db88f5281-setup.c | 4 ++--
arch/arm/mach-orion5x/dns323-setup.c | 2 +-
arch/arm/mach-orion5x/edmini_v2-setup.c | 2 +-
arch/arm/mach-orion5x/kurobox_pro-setup.c | 4 ++--
arch/arm/mach-orion5x/ls-chl-setup.c | 2 +-
arch/arm/mach-orion5x/ls_hgl-setup.c | 2 +-
arch/arm/mach-orion5x/lsmini-setup.c | 2 +-
arch/arm/mach-orion5x/mss2-setup.c | 2 +-
arch/arm/mach-orion5x/mv2120-setup.c | 2 +-
arch/arm/mach-orion5x/net2big-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f5182-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 2 +-
arch/arm/mach-orion5x/terastation_pro2-setup.c | 2 +-
arch/arm/mach-orion5x/ts209-setup.c | 2 +-
arch/arm/mach-orion5x/ts409-setup.c | 2 +-
arch/arm/mach-orion5x/ts78xx-setup.c | 2 +-
arch/arm/mach-orion5x/tsx09-common.c | 2 +-
arch/arm/mach-orion5x/wnr854t-setup.c | 2 +-
arch/arm/mach-orion5x/wrt350n-v2-setup.c | 2 +-
arch/arm/plat-orion/common.c | 8 ++++----
arch/arm/plat-orion/include/plat/audio.h | 7 -------
arch/arm/plat-orion/include/plat/common.h | 2 +-
drivers/dma/mv_xor.c | 2 +-
drivers/i2c/busses/i2c-mv64xxx.c | 2 +-
drivers/mmc/host/mvsdio.c | 2 +-
drivers/mtd/nand/orion_nand.c | 2 +-
drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +-
drivers/usb/host/ehci-orion.c | 2 +-
include/linux/mv643xx.h | 4 ++--
.../linux/platform_data}/ehci-orion.h | 6 ++----
include/linux/platform_data/kirkwood-audio.h | 7 +++++++
include/linux/{ => platform_data}/mv643xx_eth.h | 4 ++--
include/linux/{ => platform_data}/mv643xx_i2c.h | 4 ++--
.../plat => include/linux/platform_data}/mv_xor.h | 6 ++----
.../plat => include/linux/platform_data}/mvsdio.h | 6 ++----
.../linux/platform_data}/orion_nand.h | 6 ++----
sound/soc/kirkwood/kirkwood-i2s.c | 2 +-
sound/soc/kirkwood/kirkwood-openrd.c | 1 -
sound/soc/kirkwood/kirkwood-t5325.c | 1 -
75 files changed, 108 insertions(+), 118 deletions(-)
delete mode 100644 arch/arm/plat-orion/include/plat/audio.h
rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/ehci-orion.h (78%)
create mode 100644 include/linux/platform_data/kirkwood-audio.h
rename include/linux/{ => platform_data}/mv643xx_eth.h (96%)
rename include/linux/{ => platform_data}/mv643xx_i2c.h (89%)
rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/mv_xor.h (77%)
rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/mvsdio.h (77%)
rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/orion_nand.h (82%)
^ permalink raw reply [flat|nested] 27+ messages in thread* [GIT PULL V3 4/5] ARM: Kirkwood: cleanup for v3.7
2012-09-21 19:57 ` [GIT PULL V3 4/5] ARM: Kirkwood: cleanup " Jason Cooper
2012-09-22 1:48 ` [GIT PULL V4 4a/5] " Jason Cooper
2012-09-22 1:53 ` [GIT PULL V4 4b/5] ARM: Kirkwood: platform_data " Jason Cooper
@ 2012-09-22 5:17 ` Olof Johansson
2012-09-22 13:31 ` Jason Cooper
2 siblings, 1 reply; 27+ messages in thread
From: Olof Johansson @ 2012-09-22 5:17 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Sep 21, 2012 at 03:57:14PM -0400, Jason Cooper wrote:
>
> NOTE: This branch depends on both kirkwood/boards and kirkwood/dt (and,
> by extension, kirkwood/addr_decode). Some of that got pulled into this
> summary (kirkwood/boards). Is this correct? Sould I be basing the
> pullreq on v3.6-rc5? That would summarize all three branches. Doesn't
> seem as useful.
What I tend to do in these cases is that I merge the dependent branches into
a temporary working branch, then merge in the "new" branch on top, and get the
diffstat from the last merge there.
It also looks like the base for this branch is something that is not a full
-rc, please only base your branches on -rcs since that makes merge history much
cleaner and easier to deal with on our side.
So, for example:
git checkout v3.6-rc5
git merge kirkwood/boards
git merge kirkwood/dt
And then you can use that HEAD as the reference in request-pull.
-Olof
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL V3 4/5] ARM: Kirkwood: cleanup for v3.7
2012-09-22 5:17 ` [GIT PULL V3 4/5] ARM: Kirkwood: cleanup " Olof Johansson
@ 2012-09-22 13:31 ` Jason Cooper
0 siblings, 0 replies; 27+ messages in thread
From: Jason Cooper @ 2012-09-22 13:31 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Sep 21, 2012 at 10:17:25PM -0700, Olof Johansson wrote:
> On Fri, Sep 21, 2012 at 03:57:14PM -0400, Jason Cooper wrote:
> >
> > NOTE: This branch depends on both kirkwood/boards and kirkwood/dt (and,
> > by extension, kirkwood/addr_decode). Some of that got pulled into this
> > summary (kirkwood/boards). Is this correct? Sould I be basing the
> > pullreq on v3.6-rc5? That would summarize all three branches. Doesn't
> > seem as useful.
>
> What I tend to do in these cases is that I merge the dependent branches into
> a temporary working branch, then merge in the "new" branch on top, and get the
> diffstat from the last merge there.
>
> It also looks like the base for this branch is something that is not a full
> -rc, please only base your branches on -rcs since that makes merge history much
> cleaner and easier to deal with on our side.
>
> So, for example:
>
> git checkout v3.6-rc5
> git merge kirkwood/boards
> git merge kirkwood/dt
Yes, that's exactly what I did. My mistake was in my request-pull
command. I based it on kirkwood/dt, which then caused it to list
kirkwood/boards (or, swap /dt and /boards, doesn't matter, either way is
wrong) along with the /cleanup. Using a base of FIRSTPATCH^ seems to
work much better for generating the diffstat. See my V4 of this pullrq.
So for V4 /cleanup:
$ git request-pull fe525da^ mvebu-infradead-pub kirkwood/cleanup
The following changes since commit 68fa6eb9d0dd41b1bb72bade6f6307193b18fbd1:
Merge branch 'kirkwood/boards' into kirkwood/cleanup (2012-09-21 18:54:20 +0000)
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git kirkwood/cleanup
Jamie Lentin (1):
ARM: kirkwood: Trim excess #includes in board-dnskw.c
Jason Cooper (1):
ARM: Kirkwood: ehci now specified in kirkwood.dtsi. remove legacy platform init
arch/arm/mach-kirkwood/board-dnskw.c | 9 ---------
arch/arm/mach-kirkwood/board-dockstar.c | 1 -
arch/arm/mach-kirkwood/board-iomega_ix2_200.c | 2 --
arch/arm/mach-kirkwood/board-km_kirkwood.c | 1 -
4 files changed, 0 insertions(+), 13 deletions(-)
Obviously, this will be changing as soon as I rework /dt, drop ehci, etc.
thx,
Jason.
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL V3 5/5] ARM: Kirkwood: defconfig changes for v3.7
2012-08-29 0:11 [GIT PULL] Kirkwood: board changes for v3.7 Jason Cooper
` (9 preceding siblings ...)
2012-09-21 19:57 ` [GIT PULL V3 4/5] ARM: Kirkwood: cleanup " Jason Cooper
@ 2012-09-21 19:58 ` Jason Cooper
10 siblings, 0 replies; 27+ messages in thread
From: Jason Cooper @ 2012-09-21 19:58 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 0f81bd438bed6af47a01a97d5ecbb23a7e478de6:
ARM: Dove: allow PCI to be disabled (2012-09-21 17:07:26 +0000)
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git kirkwood/defconfig
Jason Cooper (2):
ARM: Kirkwood: update defconfig
ARM: Kirkwood: add DT boards to defconfig
arch/arm/configs/kirkwood_defconfig | 38 +++++++++++++++++-----------------
1 files changed, 19 insertions(+), 19 deletions(-)
^ permalink raw reply [flat|nested] 27+ messages in thread