From: jason@lakedaemon.net (Jason Cooper)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL V2 1/4] ARM: Kirkwood: DT bindings for v3.7
Date: Mon, 10 Sep 2012 01:48:35 -0400 [thread overview]
Message-ID: <20120910054835.GC15277@titan.lakedaemon.net> (raw)
In-Reply-To: <20120829001129.GO19437@titan.lakedaemon.net>
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
next prev parent reply other threads:[~2012-09-10 5:48 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
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-05 23:58 ` Olof Johansson
2012-09-10 5:31 ` Jason Cooper
2012-09-10 5:40 ` [GIT PULL V2] ARM: cache-l2x0 for rmk's tree Jason Cooper
2012-09-10 5:48 ` Jason Cooper [this message]
2012-09-13 5:30 ` [GIT PULL V2 1/4] ARM: Kirkwood: DT bindings for v3.7 Olof Johansson
2012-09-18 17:24 ` Jason Cooper
2012-09-19 13:59 ` Arnd Bergmann
2012-09-10 5:57 ` [GIT PULL V2 2/4] ARM: Kirkwood: boards " Jason Cooper
2012-09-10 6:03 ` [GIT PULL V2 3/4] ARM: Kirkwood: cleanup " Jason Cooper
2012-09-10 6:07 ` [GIT PULL V2 4/4] ARM: Kirkwood: defconfig changes " Jason Cooper
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
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
2012-09-21 19:48 ` [GIT PULL V3 3/5] ARM: Kirkwood: board " Jason Cooper
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 ` [GIT PULL V3 4/5] ARM: Kirkwood: cleanup " Olof Johansson
2012-09-22 13:31 ` Jason Cooper
2012-09-21 19:58 ` [GIT PULL V3 5/5] ARM: Kirkwood: defconfig changes " Jason Cooper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120910054835.GC15277@titan.lakedaemon.net \
--to=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.