* [GIT PULL] ARM: mvebu: driver changes for v3.12
@ 2013-08-14 18:59 Jason Cooper
2013-08-16 6:15 ` Olof Johansson
0 siblings, 1 reply; 9+ messages in thread
From: Jason Cooper @ 2013-08-14 18:59 UTC (permalink / raw)
To: linux-arm-kernel
Arnd, Olof,
This rather long branch adds the MBus devicetree binding and converts
everything over to using it. It's been in -next over a week and should
be pretty stable.
Note: There is a merge conflict with arm-soc/for-next, I've attached the
resolution after the summary.
thx,
Jason.
The following changes since commit ad81f0545ef01ea651886dddac4bef6cec930092:
Linux 3.11-rc1 (2013-07-14 15:18:27 -0700)
are available in the git repository at:
git://git.infradead.org/linux-mvebu.git tags/drivers-3.12
for you to fetch changes up to a0cec7867ffdf5d153d29b3a8243911ea8dfd366:
memory: mvebu-devbus: Remove unused variable (2013-08-12 16:43:28 +0000)
----------------------------------------------------------------
mvebu drivers changes for v3.12
- MBus devicetree bindings
- devbus update for address decoding window, cleanup
----------------------------------------------------------------
Ezequiel Garcia (22):
memory: mvebu-devbus: Remove address decoding window workaround
bus: mvebu-mbus: Factor out initialization details
bus: mvebu-mbus: Introduce device tree binding
bus: mvebu-mbus: Add static window allocation to the DT binding
bus: mvebu-mbus: Add new API for the PCIe memory and IO aperture
PCI: mvebu: Check valid base address before port setup
ARM: mvebu: Remove the harcoded BootROM window allocation
ARM: mvebu: Initialize MBus using the DT binding
ARM: mvebu: Use the preprocessor on Armada 370/XP device tree files
ARM: mvebu: Add MBus to Armada 370/XP device tree
ARM: mvebu: Add BootROM to Armada 370/XP device tree
ARM: mvebu: Relocate Armada 370/XP DeviceBus device tree nodes
ARM: mvebu: Relocate Armada 370/XP PCIe device tree nodes
ARM: kirkwood: Split DT and legacy MBus initialization
ARM: kirkwood: Use the preprocessor on device tree files
ARM: kirkwood: Introduce MBus DT node
ARM: kirkwood: Introduce MBUS_ID
ARM: kirkwood: Relocate PCIe device tree nodes
bus: mvebu-mbus: Add devicetree binding
ARM: mvebu: Fix AXP-WiFi-AP DT for MBUS DT binding
ARM: mvebu: Relocate PCIe node in Armada 370 RD board
memory: mvebu-devbus: Remove unused variable
Jason Cooper (1):
ARM: mvebu: use dts pre-processor for mv78230
Thomas Petazzoni (12):
bus: mvebu-mbus: Add new API for window creation
ARM: kirkwood: Move to ID based MBus window creation
ARM: mv78xx0: Move to ID based window creation
ARM: orion5x: Move to ID based window creation
ARM: dove: Move to ID based window creation
PCI: mvebu: Adapt to the new device tree layout
bus: mvebu-mbus: Remove the no longer used name-based API
bus: mvebu-mbus: Remove name -> target, attribute mapping tables
bus: mvebu-mbus: Update main description
bus: mvebu-mbus: Factorize Armada 370/XP data structures
PCI: mvebu: Adapt to the new device tree layout
ARM: mvebu: add support for the AXP WiFi AP board
.../devicetree/bindings/bus/mvebu-mbus.txt | 276 +++++++++++++
.../devicetree/bindings/pci/mvebu-pci.txt | 145 +++++--
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/armada-370-db.dts | 5 +-
arch/arm/boot/dts/armada-370-mirabox.dts | 37 +-
arch/arm/boot/dts/armada-370-rd.dts | 37 +-
arch/arm/boot/dts/armada-370-xp.dtsi | 111 +++---
arch/arm/boot/dts/armada-370.dtsi | 112 +++---
arch/arm/boot/dts/armada-xp-axpwifiap.dts | 164 ++++++++
arch/arm/boot/dts/armada-xp-db.dts | 131 +++---
arch/arm/boot/dts/armada-xp-gp.dts | 107 +++--
arch/arm/boot/dts/armada-xp-mv78230.dtsi | 224 ++++++-----
arch/arm/boot/dts/armada-xp-mv78260.dtsi | 263 ++++++------
arch/arm/boot/dts/armada-xp-mv78460.dtsi | 411 ++++++++++---------
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 88 ++--
arch/arm/boot/dts/armada-xp.dtsi | 9 +-
arch/arm/boot/dts/kirkwood-6281.dtsi | 66 +--
arch/arm/boot/dts/kirkwood-6282.dtsi | 102 ++---
arch/arm/boot/dts/kirkwood-cloudbox.dts | 4 +-
arch/arm/boot/dts/kirkwood-db-88f6281.dts | 7 +-
arch/arm/boot/dts/kirkwood-db-88f6282.dts | 7 +-
arch/arm/boot/dts/kirkwood-db.dtsi | 10 +-
arch/arm/boot/dts/kirkwood-dns320.dts | 2 +-
arch/arm/boot/dts/kirkwood-dns325.dts | 2 +-
arch/arm/boot/dts/kirkwood-dnskw.dtsi | 4 +-
arch/arm/boot/dts/kirkwood-dockstar.dts | 4 +-
arch/arm/boot/dts/kirkwood-dreamplug.dts | 4 +-
arch/arm/boot/dts/kirkwood-goflexnet.dts | 4 +-
.../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 4 +-
arch/arm/boot/dts/kirkwood-ib62x0.dts | 4 +-
arch/arm/boot/dts/kirkwood-iconnect.dts | 23 +-
arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 4 +-
arch/arm/boot/dts/kirkwood-is2.dts | 2 +-
arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 4 +-
arch/arm/boot/dts/kirkwood-lschlv2.dts | 2 +-
arch/arm/boot/dts/kirkwood-lsxhl.dts | 2 +-
arch/arm/boot/dts/kirkwood-lsxl.dtsi | 4 +-
arch/arm/boot/dts/kirkwood-mplcec4.dts | 23 +-
.../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 23 +-
arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 4 +-
arch/arm/boot/dts/kirkwood-ns2.dts | 2 +-
arch/arm/boot/dts/kirkwood-ns2lite.dts | 2 +-
arch/arm/boot/dts/kirkwood-ns2max.dts | 2 +-
arch/arm/boot/dts/kirkwood-ns2mini.dts | 2 +-
arch/arm/boot/dts/kirkwood-nsa310.dts | 23 +-
arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 4 +-
arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi | 4 +-
arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts | 2 +-
arch/arm/boot/dts/kirkwood-sheevaplug.dts | 2 +-
arch/arm/boot/dts/kirkwood-topkick.dts | 4 +-
arch/arm/boot/dts/kirkwood-ts219-6281.dts | 6 +-
arch/arm/boot/dts/kirkwood-ts219-6282.dts | 25 +-
arch/arm/boot/dts/kirkwood-ts219.dtsi | 17 +-
arch/arm/boot/dts/kirkwood.dtsi | 17 +-
arch/arm/mach-dove/common.c | 68 ++--
arch/arm/mach-kirkwood/board-dt.c | 1 +
arch/arm/mach-kirkwood/common.c | 26 +-
arch/arm/mach-kirkwood/pcie.c | 40 +-
arch/arm/mach-mv78xx0/pcie.c | 23 +-
arch/arm/mach-mvebu/armada-370-xp.c | 34 +-
arch/arm/mach-mvebu/platsmp.c | 25 +-
arch/arm/mach-orion5x/common.c | 36 +-
arch/arm/mach-orion5x/common.h | 17 +
arch/arm/mach-orion5x/d2net-setup.c | 6 +-
arch/arm/mach-orion5x/db88f5281-setup.c | 24 +-
arch/arm/mach-orion5x/dns323-setup.c | 6 +-
arch/arm/mach-orion5x/edmini_v2-setup.c | 6 +-
arch/arm/mach-orion5x/kurobox_pro-setup.c | 12 +-
arch/arm/mach-orion5x/ls-chl-setup.c | 6 +-
arch/arm/mach-orion5x/ls_hgl-setup.c | 6 +-
arch/arm/mach-orion5x/lsmini-setup.c | 6 +-
arch/arm/mach-orion5x/mss2-setup.c | 6 +-
arch/arm/mach-orion5x/mv2120-setup.c | 6 +-
arch/arm/mach-orion5x/net2big-setup.c | 6 +-
arch/arm/mach-orion5x/pci.c | 9 +-
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 6 +-
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 6 +-
arch/arm/mach-orion5x/rd88f5182-setup.c | 13 +-
arch/arm/mach-orion5x/terastation_pro2-setup.c | 6 +-
arch/arm/mach-orion5x/ts209-setup.c | 6 +-
arch/arm/mach-orion5x/ts409-setup.c | 6 +-
arch/arm/mach-orion5x/wnr854t-setup.c | 6 +-
arch/arm/mach-orion5x/wrt350n-v2-setup.c | 6 +-
drivers/bus/mvebu-mbus.c | 441 ++++++++++++---------
drivers/memory/mvebu-devbus.c | 72 +---
drivers/pci/host/pci-mvebu.c | 115 ++++--
include/linux/mbus.h | 16 +-
87 files changed, 2212 insertions(+), 1404 deletions(-)
create mode 100644 Documentation/devicetree/bindings/bus/mvebu-mbus.txt
create mode 100644 arch/arm/boot/dts/armada-xp-axpwifiap.dts
And the promised resolution with arm-soc/for-next:
------------>8------------------
commit 89602312c5755c87a5ca6ba8ef6b0fce9d510951
Merge: a0cec78 f23afe2
Author: Jason Cooper <jason@lakedaemon.net>
Date: Wed Aug 14 18:55:13 2013 +0000
Merge remote-tracking branch 'arm-soc/for-next' into mvebu/drivers
Conflicts:
arch/arm/boot/dts/kirkwood.dtsi
diff --cc arch/arm/boot/dts/kirkwood-db.dtsi
index 45c1bf7,ca8bf36..c0e2a58
--- a/arch/arm/boot/dts/kirkwood-db.dtsi
+++ b/arch/arm/boot/dts/kirkwood-db.dtsi
@@@ -77,5 -77,29 +77,21 @@@
cd-gpios = <&gpio1 6 0>;
status = "okay";
};
-
- pcie-controller {
- status = "okay";
-
- pcie at 1,0 {
- status = "okay";
- };
- };
};
};
+
+ &mdio {
+ status = "okay";
+
+ ethphy0: ethernet-phy at 8 {
+ device_type = "ethernet-phy";
+ reg = <8>;
+ };
+ };
+
+ ð0 {
+ status = "okay";
+ ethernet0-port at 0 {
+ phy-handle = <ðphy0>;
+ };
+ };
diff --cc arch/arm/boot/dts/kirkwood-ts219.dtsi
index 7019cf6,102eaeb..39158cf
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@@ -97,5 -87,28 +97,21 @@@
status = "okay";
nr-ports = <2>;
};
- pcie-controller {
- status = "okay";
-
- pcie at 1,0 {
- status = "okay";
- };
- };
};
};
+
+ &mdio {
+ status = "okay";
+
+ ethphy0: ethernet-phy {
+ device_type = "ethernet-phy";
+ /* overwrite reg property in board file */
+ };
+ };
+
+ ð0 {
+ status = "okay";
+ ethernet0-port at 0 {
+ phy-handle = <ðphy0>;
+ };
+ };
diff --cc arch/arm/boot/dts/kirkwood.dtsi
index 70f414d,1d6921d..6489b98
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@@ -22,23 -20,7 +22,16 @@@
gpio0 = &gpio0;
gpio1 = &gpio1;
};
- intc: interrupt-controller {
- compatible = "marvell,orion-intc", "marvell,intc";
- interrupt-controller;
- #interrupt-cells = <1>;
- reg = <0xf1020204 0x04>,
- <0xf1020214 0x04>;
- };
+ mbus {
+ compatible = "marvell,kirkwood-mbus", "simple-bus";
+ #address-cells = <2>;
+ #size-cells = <1>;
+ controller = <&mbusc>;
+ pcie-mem-aperture = <0xe0000000 0x10000000>; /* 256 MiB memory space */
+ pcie-io-aperture = <0xf2000000 0x100000>; /* 1 MiB I/O space */
+ };
+
ocp at f1000000 {
compatible = "simple-bus";
ranges = <0x00000000 0xf1000000 0x0100000
@@@ -47,11 -30,30 +40,35 @@@
#address-cells = <1>;
#size-cells = <1>;
+ timer: timer at 20300 {
+ compatible = "marvell,orion-timer";
+ reg = <0x20300 0x20>;
+ interrupt-parent = <&bridge_intc>;
+ interrupts = <1>, <2>;
+ clocks = <&core_clk 0>;
+ };
+
+ intc: main-interrupt-ctrl at 20200 {
+ compatible = "marvell,orion-intc";
+ interrupt-controller;
+ #interrupt-cells = <1>;
+ reg = <0x20200 0x10>, <0x20210 0x10>;
+ };
+
+ bridge_intc: bridge-interrupt-ctrl at 20110 {
+ compatible = "marvell,orion-bridge-intc";
+ interrupt-controller;
+ #interrupt-cells = <1>;
+ reg = <0x20110 0x8>;
+ interrupts = <1>;
+ marvell,#interrupts = <6>;
+ };
+
+ mbusc: mbus-controller at 20000 {
+ compatible = "marvell,mbus-controller";
+ reg = <0x20000 0x80>, <0x1500 0x20>;
+ };
+
core_clk: core-clocks at 10030 {
compatible = "marvell,kirkwood-core-clock";
reg = <0x10030 0x4>;
diff --cc arch/arm/mach-orion5x/edmini_v2-setup.c
index 0fc33c5,7d316ed..f66c1b2
--- a/arch/arm/mach-orion5x/edmini_v2-setup.c
+++ b/arch/arm/mach-orion5x/edmini_v2-setup.c
@@@ -152,12 -144,9 +144,11 @@@ void __init edmini_v2_init(void
* Configure peripherals.
*/
orion5x_ehci0_init();
- orion5x_eth_init(&edmini_v2_eth_data);
- mvebu_mbus_add_window("devbus-boot", EDMINI_V2_NOR_BOOT_BASE,
- EDMINI_V2_NOR_BOOT_SIZE);
+ mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+ ORION_MBUS_DEVBUS_BOOT_ATTR,
+ EDMINI_V2_NOR_BOOT_BASE,
+ EDMINI_V2_NOR_BOOT_SIZE);
platform_device_register(&edmini_v2_nor_flash);
pr_notice("edmini_v2: USB device port, flash write and power-off "
^ permalink raw reply [flat|nested] 9+ messages in thread
* [GIT PULL] ARM: mvebu: driver changes for v3.12
2013-08-14 18:59 [GIT PULL] ARM: mvebu: driver changes for v3.12 Jason Cooper
@ 2013-08-16 6:15 ` Olof Johansson
2013-12-12 15:25 ` [PATCH 0/4] ARM: mvebu: sort DT nodes by reg address Jason Cooper
0 siblings, 1 reply; 9+ messages in thread
From: Olof Johansson @ 2013-08-16 6:15 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Wed, Aug 14, 2013 at 02:59:45PM -0400, Jason Cooper wrote:
> Arnd, Olof,
>
> This rather long branch adds the MBus devicetree binding and converts
> everything over to using it. It's been in -next over a week and should
> be pretty stable.
>
> Note: There is a merge conflict with arm-soc/for-next, I've attached the
> resolution after the summary.
Pulled into next/soc.
> diff --cc arch/arm/boot/dts/kirkwood.dtsi
> index 70f414d,1d6921d..6489b98
> --- a/arch/arm/boot/dts/kirkwood.dtsi
> +++ b/arch/arm/boot/dts/kirkwood.dtsi
> @@@ -47,11 -30,30 +40,35 @@@
> #address-cells = <1>;
> #size-cells = <1>;
>
> + timer: timer at 20300 {
> + compatible = "marvell,orion-timer";
> + reg = <0x20300 0x20>;
> + interrupt-parent = <&bridge_intc>;
> + interrupts = <1>, <2>;
> + clocks = <&core_clk 0>;
> + };
> +
> + intc: main-interrupt-ctrl at 20200 {
> + compatible = "marvell,orion-intc";
> + interrupt-controller;
> + #interrupt-cells = <1>;
> + reg = <0x20200 0x10>, <0x20210 0x10>;
> + };
> +
> + bridge_intc: bridge-interrupt-ctrl at 20110 {
> + compatible = "marvell,orion-bridge-intc";
> + interrupt-controller;
> + #interrupt-cells = <1>;
> + reg = <0x20110 0x8>;
> + interrupts = <1>;
> + marvell,#interrupts = <6>;
> + };
> +
> + mbusc: mbus-controller at 20000 {
> + compatible = "marvell,mbus-controller";
> + reg = <0x20000 0x80>, <0x1500 0x20>;
> + };
> +
> core_clk: core-clocks at 10030 {
> compatible = "marvell,kirkwood-core-clock";
> reg = <0x10030 0x4>;
This file is a real mess. :( Nothing is sorted properly under the ocp/ bus.
It's common to sort by memory address. Or I'd even take alphabetically if
there was a good reason to do so. Just some order of some kind.
That would have avoided the conflicts this time around, since it seems that
devices are added in completely random order here, but adjacent. If they'd been
spaced out, git would have handled it nicely on its own.
-Olof
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 0/4] ARM: mvebu: sort DT nodes by reg address
2013-08-16 6:15 ` Olof Johansson
@ 2013-12-12 15:25 ` Jason Cooper
2013-12-12 15:25 ` [PATCH 1/4] ARM: kirkwood: sort dt nodes by address Jason Cooper
` (5 more replies)
0 siblings, 6 replies; 9+ messages in thread
From: Jason Cooper @ 2013-12-12 15:25 UTC (permalink / raw)
To: linux-arm-kernel
Olof, all,
I love December! I'm getting around to some of the items on my -onice folder.
Namely, this one:
On Thu, Aug 15, 2013 at 11:15:00PM -0700, Olof Johansson wrote:
> On Wed, Aug 14, 2013 at 02:59:45PM -0400, Jason Cooper wrote:
...
> > diff --cc arch/arm/boot/dts/kirkwood.dtsi
> > index 70f414d,1d6921d..6489b98
> > --- a/arch/arm/boot/dts/kirkwood.dtsi
> > +++ b/arch/arm/boot/dts/kirkwood.dtsi
> > @@@ -47,11 -30,30 +40,35 @@@
> > #address-cells = <1>;
> > #size-cells = <1>;
> >
> > + timer: timer at 20300 {
> > + compatible = "marvell,orion-timer";
> > + reg = <0x20300 0x20>;
> > + interrupt-parent = <&bridge_intc>;
> > + interrupts = <1>, <2>;
> > + clocks = <&core_clk 0>;
> > + };
> > +
> > + intc: main-interrupt-ctrl at 20200 {
> > + compatible = "marvell,orion-intc";
> > + interrupt-controller;
> > + #interrupt-cells = <1>;
> > + reg = <0x20200 0x10>, <0x20210 0x10>;
> > + };
> > +
> > + bridge_intc: bridge-interrupt-ctrl at 20110 {
> > + compatible = "marvell,orion-bridge-intc";
> > + interrupt-controller;
> > + #interrupt-cells = <1>;
> > + reg = <0x20110 0x8>;
> > + interrupts = <1>;
> > + marvell,#interrupts = <6>;
> > + };
> > +
> > + mbusc: mbus-controller at 20000 {
> > + compatible = "marvell,mbus-controller";
> > + reg = <0x20000 0x80>, <0x1500 0x20>;
> > + };
> > +
> > core_clk: core-clocks at 10030 {
> > compatible = "marvell,kirkwood-core-clock";
> > reg = <0x10030 0x4>;
>
> This file is a real mess. :( Nothing is sorted properly under the ocp/ bus.
> It's common to sort by memory address. Or I'd even take alphabetically if
> there was a good reason to do so. Just some order of some kind.
Done.
thx,
Jason.
Jason Cooper (4):
ARM: kirkwood: sort dt nodes by address
ARM: dove: sort DT nodes by address
ARM: orion5x: sort DT nodes by address
ARM: mvebu: sort DT nodes by address
arch/arm/boot/dts/armada-370-xp.dtsi | 176 ++++++-------
arch/arm/boot/dts/armada-370.dtsi | 74 +++---
arch/arm/boot/dts/armada-xp.dtsi | 100 +++----
arch/arm/boot/dts/dove.dtsi | 496 +++++++++++++++++------------------
arch/arm/boot/dts/kirkwood.dtsi | 140 +++++-----
arch/arm/boot/dts/orion5x.dtsi | 106 ++++----
6 files changed, 546 insertions(+), 546 deletions(-)
--
1.8.5.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/4] ARM: kirkwood: sort dt nodes by address
2013-12-12 15:25 ` [PATCH 0/4] ARM: mvebu: sort DT nodes by reg address Jason Cooper
@ 2013-12-12 15:25 ` Jason Cooper
2013-12-12 15:25 ` [PATCH 2/4] ARM: dove: sort DT " Jason Cooper
` (4 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Jason Cooper @ 2013-12-12 15:25 UTC (permalink / raw)
To: linux-arm-kernel
This has caused merge conflicts in the past.
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
---
arch/arm/boot/dts/kirkwood.dtsi | 140 ++++++++++++++++++++--------------------
1 file changed, 70 insertions(+), 70 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index dd58a25a4166..1da94c187085 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -70,39 +70,21 @@
#address-cells = <1>;
#size-cells = <1>;
- mbusc: mbus-controller at 20000 {
- compatible = "marvell,mbus-controller";
- reg = <0x20000 0x80>, <0x1500 0x20>;
- };
-
- timer: timer at 20300 {
- compatible = "marvell,orion-timer";
- reg = <0x20300 0x20>;
- interrupt-parent = <&bridge_intc>;
- interrupts = <1>, <2>;
- clocks = <&core_clk 0>;
- };
-
- intc: main-interrupt-ctrl at 20200 {
- compatible = "marvell,orion-intc";
- interrupt-controller;
- #interrupt-cells = <1>;
- reg = <0x20200 0x10>, <0x20210 0x10>;
- };
-
- bridge_intc: bridge-interrupt-ctrl at 20110 {
- compatible = "marvell,orion-bridge-intc";
- interrupt-controller;
- #interrupt-cells = <1>;
- reg = <0x20110 0x8>;
- interrupts = <1>;
- marvell,#interrupts = <6>;
- };
-
core_clk: core-clocks at 10030 {
compatible = "marvell,kirkwood-core-clock";
reg = <0x10030 0x4>;
- #clock-cells = <1>;
+ #clock-cells = <1>;
+ };
+
+ spi at 10600 {
+ compatible = "marvell,orion-spi";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ cell-index = <0>;
+ interrupts = <23>;
+ reg = <0x10600 0x28>;
+ clocks = <&gate_clk 7>;
+ status = "disabled";
};
gpio0: gpio at 10100 {
@@ -129,6 +111,17 @@
clocks = <&gate_clk 7>;
};
+ i2c at 11000 {
+ compatible = "marvell,mv64xxx-i2c";
+ reg = <0x11000 0x20>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ interrupts = <29>;
+ clock-frequency = <100000>;
+ clocks = <&gate_clk 7>;
+ status = "disabled";
+ };
+
serial at 12000 {
compatible = "ns16550a";
reg = <0x12000 0x100>;
@@ -147,15 +140,18 @@
status = "disabled";
};
- spi at 10600 {
- compatible = "marvell,orion-spi";
- #address-cells = <1>;
- #size-cells = <0>;
- cell-index = <0>;
- interrupts = <23>;
- reg = <0x10600 0x28>;
- clocks = <&gate_clk 7>;
- status = "disabled";
+ mbusc: mbus-controller at 20000 {
+ compatible = "marvell,mbus-controller";
+ reg = <0x20000 0x80>, <0x1500 0x20>;
+ };
+
+ bridge_intc: bridge-interrupt-ctrl at 20110 {
+ compatible = "marvell,orion-bridge-intc";
+ interrupt-controller;
+ #interrupt-cells = <1>;
+ reg = <0x20110 0x8>;
+ interrupts = <1>;
+ marvell,#interrupts = <6>;
};
gate_clk: clock-gating-control at 2011c {
@@ -165,6 +161,21 @@
#clock-cells = <1>;
};
+ intc: main-interrupt-ctrl at 20200 {
+ compatible = "marvell,orion-intc";
+ interrupt-controller;
+ #interrupt-cells = <1>;
+ reg = <0x20200 0x10>, <0x20210 0x10>;
+ };
+
+ timer: timer at 20300 {
+ compatible = "marvell,orion-timer";
+ reg = <0x20300 0x20>;
+ interrupt-parent = <&bridge_intc>;
+ interrupts = <1>, <2>;
+ clocks = <&core_clk 0>;
+ };
+
wdt: watchdog-timer at 20300 {
compatible = "marvell,orion-wdt";
reg = <0x20300 0x28>;
@@ -174,6 +185,14 @@
status = "okay";
};
+ ehci at 50000 {
+ compatible = "marvell,orion-ehci";
+ reg = <0x50000 0x1000>;
+ interrupts = <19>;
+ clocks = <&gate_clk 3>;
+ status = "okay";
+ };
+
xor at 60800 {
compatible = "marvell,orion-xor";
reg = <0x60800 0x100
@@ -214,37 +233,6 @@
};
};
- ehci@50000 {
- compatible = "marvell,orion-ehci";
- reg = <0x50000 0x1000>;
- interrupts = <19>;
- clocks = <&gate_clk 3>;
- status = "okay";
- };
-
- i2c at 11000 {
- compatible = "marvell,mv64xxx-i2c";
- reg = <0x11000 0x20>;
- #address-cells = <1>;
- #size-cells = <0>;
- interrupts = <29>;
- clock-frequency = <100000>;
- clocks = <&gate_clk 7>;
- status = "disabled";
- };
-
- mdio: mdio-bus at 72004 {
- compatible = "marvell,orion-mdio";
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <0x72004 0x84>;
- interrupts = <46>;
- clocks = <&gate_clk 0>;
- status = "disabled";
-
- /* add phy nodes in board file */
- };
-
eth0: ethernet-controller at 72000 {
compatible = "marvell,kirkwood-eth";
#address-cells = <1>;
@@ -265,6 +253,18 @@
};
};
+ mdio: mdio-bus at 72004 {
+ compatible = "marvell,orion-mdio";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0x72004 0x84>;
+ interrupts = <46>;
+ clocks = <&gate_clk 0>;
+ status = "disabled";
+
+ /* add phy nodes in board file */
+ };
+
eth1: ethernet-controller at 76000 {
compatible = "marvell,kirkwood-eth";
#address-cells = <1>;
--
1.8.5.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/4] ARM: dove: sort DT nodes by address
2013-12-12 15:25 ` [PATCH 0/4] ARM: mvebu: sort DT nodes by reg address Jason Cooper
2013-12-12 15:25 ` [PATCH 1/4] ARM: kirkwood: sort dt nodes by address Jason Cooper
@ 2013-12-12 15:25 ` Jason Cooper
2013-12-12 15:25 ` [PATCH 3/4] ARM: orion5x: " Jason Cooper
` (3 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Jason Cooper @ 2013-12-12 15:25 UTC (permalink / raw)
To: linux-arm-kernel
Prevent future (unnecessary) merge conflicts
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
---
arch/arm/boot/dts/dove.dtsi | 496 ++++++++++++++++++++++----------------------
1 file changed, 248 insertions(+), 248 deletions(-)
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index db24b41a5264..852db2860015 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -107,60 +107,29 @@
0xffffe000 MBUS_ID(0x03, 0x01) 0 0x0000800 /* CESA SRAM 2k */
0xfffff000 MBUS_ID(0x0d, 0x00) 0 0x0000800>; /* PMU SRAM 2k */
- mbusc: mbus-ctrl at 20000 {
- compatible = "marvell,mbus-controller";
- reg = <0x20000 0x80>, <0x800100 0x8>;
- };
-
- timer: timer at 20300 {
- compatible = "marvell,orion-timer";
- reg = <0x20300 0x20>;
- interrupt-parent = <&bridge_intc>;
- interrupts = <1>, <2>;
+ spi0: spi-ctrl at 10600 {
+ compatible = "marvell,orion-spi";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ cell-index = <0>;
+ interrupts = <6>;
+ reg = <0x10600 0x28>;
clocks = <&core_clk 0>;
+ pinctrl-0 = <&pmx_spi0>;
+ pinctrl-names = "default";
+ status = "disabled";
};
- intc: main-interrupt-ctrl at 20200 {
- compatible = "marvell,orion-intc";
- interrupt-controller;
- #interrupt-cells = <1>;
- reg = <0x20200 0x10>, <0x20210 0x10>;
- };
-
- bridge_intc: bridge-interrupt-ctrl at 20110 {
- compatible = "marvell,orion-bridge-intc";
- interrupt-controller;
- #interrupt-cells = <1>;
- reg = <0x20110 0x8>;
- interrupts = <0>;
- marvell,#interrupts = <5>;
- };
-
- pmu_intc: pmu-interrupt-ctrl at d0050 {
- compatible = "marvell,dove-pmu-intc";
- interrupt-controller;
- #interrupt-cells = <1>;
- reg = <0xd0050 0x8>;
- interrupts = <33>;
- marvell,#interrupts = <7>;
- };
-
- core_clk: core-clocks at d0214 {
- compatible = "marvell,dove-core-clock";
- reg = <0xd0214 0x4>;
- #clock-cells = <1>;
- };
-
- gate_clk: clock-gating-ctrl at d0038 {
- compatible = "marvell,dove-gating-clock";
- reg = <0xd0038 0x4>;
+ i2c0: i2c-ctrl at 11000 {
+ compatible = "marvell,mv64xxx-i2c";
+ reg = <0x11000 0x20>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ interrupts = <11>;
+ clock-frequency = <400000>;
+ timeout-ms = <1000>;
clocks = <&core_clk 0>;
- #clock-cells = <1>;
- };
-
- thermal: thermal-diode at d001c {
- compatible = "marvell,dove-thermal";
- reg = <0xd001c 0x0c>, <0xd005c 0x08>;
+ status = "disabled";
};
uart0: serial at 12000 {
@@ -201,34 +170,213 @@
status = "disabled";
};
- gpio0: gpio-ctrl at d0400 {
- compatible = "marvell,orion-gpio";
- #gpio-cells = <2>;
- gpio-controller;
- reg = <0xd0400 0x20>;
- ngpios = <32>;
+ spi1: spi-ctrl at 14600 {
+ compatible = "marvell,orion-spi";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ cell-index = <1>;
+ interrupts = <5>;
+ reg = <0x14600 0x28>;
+ clocks = <&core_clk 0>;
+ status = "disabled";
+ };
+
+ mbusc: mbus-ctrl at 20000 {
+ compatible = "marvell,mbus-controller";
+ reg = <0x20000 0x80>, <0x800100 0x8>;
+ };
+
+ bridge_intc: bridge-interrupt-ctrl at 20110 {
+ compatible = "marvell,orion-bridge-intc";
interrupt-controller;
- #interrupt-cells = <2>;
- interrupts = <12>, <13>, <14>, <60>;
+ #interrupt-cells = <1>;
+ reg = <0x20110 0x8>;
+ interrupts = <0>;
+ marvell,#interrupts = <5>;
};
- gpio1: gpio-ctrl at d0420 {
- compatible = "marvell,orion-gpio";
- #gpio-cells = <2>;
- gpio-controller;
- reg = <0xd0420 0x20>;
- ngpios = <32>;
+ intc: main-interrupt-ctrl at 20200 {
+ compatible = "marvell,orion-intc";
interrupt-controller;
- #interrupt-cells = <2>;
- interrupts = <61>;
+ #interrupt-cells = <1>;
+ reg = <0x20200 0x10>, <0x20210 0x10>;
};
- gpio2: gpio-ctrl at e8400 {
- compatible = "marvell,orion-gpio";
- #gpio-cells = <2>;
- gpio-controller;
- reg = <0xe8400 0x0c>;
- ngpios = <8>;
+ timer: timer at 20300 {
+ compatible = "marvell,orion-timer";
+ reg = <0x20300 0x20>;
+ interrupt-parent = <&bridge_intc>;
+ interrupts = <1>, <2>;
+ clocks = <&core_clk 0>;
+ };
+
+ crypto: crypto-engine at 30000 {
+ compatible = "marvell,orion-crypto";
+ reg = <0x30000 0x10000>,
+ <0xffffe000 0x800>;
+ reg-names = "regs", "sram";
+ interrupts = <31>;
+ clocks = <&gate_clk 15>;
+ status = "okay";
+ };
+
+ ehci0: usb-host at 50000 {
+ compatible = "marvell,orion-ehci";
+ reg = <0x50000 0x1000>;
+ interrupts = <24>;
+ clocks = <&gate_clk 0>;
+ status = "okay";
+ };
+
+ ehci1: usb-host at 51000 {
+ compatible = "marvell,orion-ehci";
+ reg = <0x51000 0x1000>;
+ interrupts = <25>;
+ clocks = <&gate_clk 1>;
+ status = "okay";
+ };
+
+ xor0: dma-engine at 60800 {
+ compatible = "marvell,orion-xor";
+ reg = <0x60800 0x100
+ 0x60a00 0x100>;
+ clocks = <&gate_clk 23>;
+ status = "okay";
+
+ channel0 {
+ interrupts = <39>;
+ dmacap,memcpy;
+ dmacap,xor;
+ };
+
+ channel1 {
+ interrupts = <40>;
+ dmacap,memcpy;
+ dmacap,xor;
+ };
+ };
+
+ xor1: dma-engine at 60900 {
+ compatible = "marvell,orion-xor";
+ reg = <0x60900 0x100
+ 0x60b00 0x100>;
+ clocks = <&gate_clk 24>;
+ status = "okay";
+
+ channel0 {
+ interrupts = <42>;
+ dmacap,memcpy;
+ dmacap,xor;
+ };
+
+ channel1 {
+ interrupts = <43>;
+ dmacap,memcpy;
+ dmacap,xor;
+ };
+ };
+
+ sdio1: sdio-host at 90000 {
+ compatible = "marvell,dove-sdhci";
+ reg = <0x90000 0x100>;
+ interrupts = <36>, <38>;
+ clocks = <&gate_clk 9>;
+ pinctrl-0 = <&pmx_sdio1>;
+ pinctrl-names = "default";
+ status = "disabled";
+ };
+
+ eth: ethernet-ctrl at 72000 {
+ compatible = "marvell,orion-eth";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0x72000 0x4000>;
+ clocks = <&gate_clk 2>;
+ marvell,tx-checksum-limit = <1600>;
+ status = "disabled";
+
+ ethernet-port at 0 {
+ device_type = "network";
+ compatible = "marvell,orion-eth-port";
+ reg = <0>;
+ interrupts = <29>;
+ /* overwrite MAC address in bootloader */
+ local-mac-address = [00 00 00 00 00 00];
+ phy-handle = <ðphy>;
+ };
+ };
+
+ mdio: mdio-bus at 72004 {
+ compatible = "marvell,orion-mdio";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0x72004 0x84>;
+ interrupts = <30>;
+ clocks = <&gate_clk 2>;
+ status = "disabled";
+
+ ethphy: ethernet-phy {
+ device_type = "ethernet-phy";
+ /* set phy address in board file */
+ };
+ };
+
+ sdio0: sdio-host at 92000 {
+ compatible = "marvell,dove-sdhci";
+ reg = <0x92000 0x100>;
+ interrupts = <35>, <37>;
+ clocks = <&gate_clk 8>;
+ pinctrl-0 = <&pmx_sdio0>;
+ pinctrl-names = "default";
+ status = "disabled";
+ };
+
+ sata0: sata-host at a0000 {
+ compatible = "marvell,orion-sata";
+ reg = <0xa0000 0x2400>;
+ interrupts = <62>;
+ clocks = <&gate_clk 3>;
+ nr-ports = <1>;
+ status = "disabled";
+ };
+
+ audio0: audio-controller at b0000 {
+ compatible = "marvell,dove-audio";
+ reg = <0xb0000 0x2210>;
+ interrupts = <19>, <20>;
+ clocks = <&gate_clk 12>;
+ clock-names = "internal";
+ status = "disabled";
+ };
+
+ audio1: audio-controller at b4000 {
+ compatible = "marvell,dove-audio";
+ reg = <0xb4000 0x2210>;
+ interrupts = <21>, <22>;
+ clocks = <&gate_clk 13>;
+ clock-names = "internal";
+ status = "disabled";
+ };
+
+ thermal: thermal-diode at d001c {
+ compatible = "marvell,dove-thermal";
+ reg = <0xd001c 0x0c>, <0xd005c 0x08>;
+ };
+
+ gate_clk: clock-gating-ctrl at d0038 {
+ compatible = "marvell,dove-gating-clock";
+ reg = <0xd0038 0x4>;
+ clocks = <&core_clk 0>;
+ #clock-cells = <1>;
+ };
+
+ pmu_intc: pmu-interrupt-ctrl at d0050 {
+ compatible = "marvell,dove-pmu-intc";
+ interrupt-controller;
+ #interrupt-cells = <1>;
+ reg = <0xd0050 0x8>;
+ interrupts = <33>;
+ marvell,#interrupts = <7>;
};
pinctrl: pin-ctrl at d0200 {
@@ -422,85 +570,32 @@
};
};
- spi0: spi-ctrl at 10600 {
- compatible = "marvell,orion-spi";
- #address-cells = <1>;
- #size-cells = <0>;
- cell-index = <0>;
- interrupts = <6>;
- reg = <0x10600 0x28>;
- clocks = <&core_clk 0>;
- pinctrl-0 = <&pmx_spi0>;
- pinctrl-names = "default";
- status = "disabled";
- };
-
- spi1: spi-ctrl at 14600 {
- compatible = "marvell,orion-spi";
- #address-cells = <1>;
- #size-cells = <0>;
- cell-index = <1>;
- interrupts = <5>;
- reg = <0x14600 0x28>;
- clocks = <&core_clk 0>;
- status = "disabled";
- };
-
- i2c0: i2c-ctrl at 11000 {
- compatible = "marvell,mv64xxx-i2c";
- reg = <0x11000 0x20>;
- #address-cells = <1>;
- #size-cells = <0>;
- interrupts = <11>;
- clock-frequency = <400000>;
- timeout-ms = <1000>;
- clocks = <&core_clk 0>;
- status = "disabled";
- };
-
- ehci0: usb-host at 50000 {
- compatible = "marvell,orion-ehci";
- reg = <0x50000 0x1000>;
- interrupts = <24>;
- clocks = <&gate_clk 0>;
- status = "okay";
- };
-
- ehci1: usb-host at 51000 {
- compatible = "marvell,orion-ehci";
- reg = <0x51000 0x1000>;
- interrupts = <25>;
- clocks = <&gate_clk 1>;
- status = "okay";
- };
-
- sdio0: sdio-host at 92000 {
- compatible = "marvell,dove-sdhci";
- reg = <0x92000 0x100>;
- interrupts = <35>, <37>;
- clocks = <&gate_clk 8>;
- pinctrl-0 = <&pmx_sdio0>;
- pinctrl-names = "default";
- status = "disabled";
+ core_clk: core-clocks at d0214 {
+ compatible = "marvell,dove-core-clock";
+ reg = <0xd0214 0x4>;
+ #clock-cells = <1>;
};
- sdio1: sdio-host at 90000 {
- compatible = "marvell,dove-sdhci";
- reg = <0x90000 0x100>;
- interrupts = <36>, <38>;
- clocks = <&gate_clk 9>;
- pinctrl-0 = <&pmx_sdio1>;
- pinctrl-names = "default";
- status = "disabled";
+ gpio0: gpio-ctrl at d0400 {
+ compatible = "marvell,orion-gpio";
+ #gpio-cells = <2>;
+ gpio-controller;
+ reg = <0xd0400 0x20>;
+ ngpios = <32>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ interrupts = <12>, <13>, <14>, <60>;
};
- sata0: sata-host at a0000 {
- compatible = "marvell,orion-sata";
- reg = <0xa0000 0x2400>;
- interrupts = <62>;
- clocks = <&gate_clk 3>;
- nr-ports = <1>;
- status = "disabled";
+ gpio1: gpio-ctrl at d0420 {
+ compatible = "marvell,orion-gpio";
+ #gpio-cells = <2>;
+ gpio-controller;
+ reg = <0xd0420 0x20>;
+ ngpios = <32>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ interrupts = <61>;
};
rtc: real-time-clock at d8500 {
@@ -510,107 +605,12 @@
interrupts = <5>;
};
- crypto: crypto-engine at 30000 {
- compatible = "marvell,orion-crypto";
- reg = <0x30000 0x10000>,
- <0xffffe000 0x800>;
- reg-names = "regs", "sram";
- interrupts = <31>;
- clocks = <&gate_clk 15>;
- status = "okay";
- };
-
- xor0: dma-engine at 60800 {
- compatible = "marvell,orion-xor";
- reg = <0x60800 0x100
- 0x60a00 0x100>;
- clocks = <&gate_clk 23>;
- status = "okay";
-
- channel0 {
- interrupts = <39>;
- dmacap,memcpy;
- dmacap,xor;
- };
-
- channel1 {
- interrupts = <40>;
- dmacap,memcpy;
- dmacap,xor;
- };
- };
-
- xor1: dma-engine at 60900 {
- compatible = "marvell,orion-xor";
- reg = <0x60900 0x100
- 0x60b00 0x100>;
- clocks = <&gate_clk 24>;
- status = "okay";
-
- channel0 {
- interrupts = <42>;
- dmacap,memcpy;
- dmacap,xor;
- };
-
- channel1 {
- interrupts = <43>;
- dmacap,memcpy;
- dmacap,xor;
- };
- };
-
- mdio: mdio-bus at 72004 {
- compatible = "marvell,orion-mdio";
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <0x72004 0x84>;
- interrupts = <30>;
- clocks = <&gate_clk 2>;
- status = "disabled";
-
- ethphy: ethernet-phy {
- device_type = "ethernet-phy";
- /* set phy address in board file */
- };
- };
-
- eth: ethernet-ctrl at 72000 {
- compatible = "marvell,orion-eth";
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <0x72000 0x4000>;
- clocks = <&gate_clk 2>;
- marvell,tx-checksum-limit = <1600>;
- status = "disabled";
-
- ethernet-port at 0 {
- device_type = "network";
- compatible = "marvell,orion-eth-port";
- reg = <0>;
- interrupts = <29>;
- /* overwrite MAC address in bootloader */
- local-mac-address = [00 00 00 00 00 00];
- phy-handle = <ðphy>;
- };
- };
-
- audio0: audio-controller at b0000 {
- compatible = "marvell,dove-audio";
- reg = <0xb0000 0x2210>;
- interrupts = <19>, <20>;
- clocks = <&gate_clk 12>;
- clock-names = "internal";
- status = "disabled";
- };
-
- audio1: audio-controller at b4000 {
- compatible = "marvell,dove-audio";
- reg = <0xb4000 0x2210>;
- interrupts = <21>, <22>;
- clocks = <&gate_clk 13>;
- clock-names = "internal";
- status = "disabled";
+ gpio2: gpio-ctrl at e8400 {
+ compatible = "marvell,orion-gpio";
+ #gpio-cells = <2>;
+ gpio-controller;
+ reg = <0xe8400 0x0c>;
+ ngpios = <8>;
};
};
};
--
1.8.5.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/4] ARM: orion5x: sort DT nodes by address
2013-12-12 15:25 ` [PATCH 0/4] ARM: mvebu: sort DT nodes by reg address Jason Cooper
2013-12-12 15:25 ` [PATCH 1/4] ARM: kirkwood: sort dt nodes by address Jason Cooper
2013-12-12 15:25 ` [PATCH 2/4] ARM: dove: sort DT " Jason Cooper
@ 2013-12-12 15:25 ` Jason Cooper
2013-12-12 15:25 ` [PATCH 4/4] ARM: mvebu: " Jason Cooper
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Jason Cooper @ 2013-12-12 15:25 UTC (permalink / raw)
To: linux-arm-kernel
Prevent future unnecessary merge conflicts
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
---
arch/arm/boot/dts/orion5x.dtsi | 106 ++++++++++++++++++++---------------------
1 file changed, 53 insertions(+), 53 deletions(-)
diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi
index e06c37e91ac6..9f51538cd9ef 100644
--- a/arch/arm/boot/dts/orion5x.dtsi
+++ b/arch/arm/boot/dts/orion5x.dtsi
@@ -42,6 +42,25 @@
interrupts = <6>, <7>, <8>, <9>;
};
+ spi at 10600 {
+ compatible = "marvell,orion-spi";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ cell-index = <0>;
+ reg = <0x10600 0x28>;
+ status = "disabled";
+ };
+
+ i2c at 11000 {
+ compatible = "marvell,mv64xxx-i2c";
+ reg = <0x11000 0x20>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ interrupts = <5>;
+ clock-frequency = <100000>;
+ status = "disabled";
+ };
+
serial at 12000 {
compatible = "ns16550a";
reg = <0x12000 0x100>;
@@ -60,15 +79,6 @@
status = "disabled";
};
- spi at 10600 {
- compatible = "marvell,orion-spi";
- #address-cells = <1>;
- #size-cells = <0>;
- cell-index = <0>;
- reg = <0x10600 0x28>;
- status = "disabled";
- };
-
wdt at 20300 {
compatible = "marvell,orion-wdt";
reg = <0x20300 0x28>;
@@ -82,30 +92,6 @@
status = "disabled";
};
- ehci at a0000 {
- compatible = "marvell,orion-ehci";
- reg = <0xa0000 0x1000>;
- interrupts = <12>;
- status = "disabled";
- };
-
- sata at 80000 {
- compatible = "marvell,orion-sata";
- reg = <0x80000 0x5000>;
- interrupts = <29>;
- status = "disabled";
- };
-
- i2c at 11000 {
- compatible = "marvell,mv64xxx-i2c";
- reg = <0x11000 0x20>;
- #address-cells = <1>;
- #size-cells = <0>;
- interrupts = <5>;
- clock-frequency = <100000>;
- status = "disabled";
- };
-
xor at 60900 {
compatible = "marvell,orion-xor";
reg = <0x60900 0x100
@@ -125,26 +111,6 @@
};
};
- crypto@90000 {
- compatible = "marvell,orion-crypto";
- reg = <0x90000 0x10000>,
- <0xf2200000 0x800>;
- reg-names = "regs", "sram";
- interrupts = <28>;
- status = "okay";
- };
-
- mdio: mdio-bus at 72004 {
- compatible = "marvell,orion-mdio";
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <0x72004 0x84>;
- interrupts = <22>;
- status = "disabled";
-
- /* add phy nodes in board file */
- };
-
eth: ethernet-controller at 72000 {
compatible = "marvell,orion-eth";
#address-cells = <1>;
@@ -162,5 +128,39 @@
/* set phy-handle property in board file */
};
};
+
+ mdio: mdio-bus at 72004 {
+ compatible = "marvell,orion-mdio";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0x72004 0x84>;
+ interrupts = <22>;
+ status = "disabled";
+
+ /* add phy nodes in board file */
+ };
+
+ sata at 80000 {
+ compatible = "marvell,orion-sata";
+ reg = <0x80000 0x5000>;
+ interrupts = <29>;
+ status = "disabled";
+ };
+
+ crypto at 90000 {
+ compatible = "marvell,orion-crypto";
+ reg = <0x90000 0x10000>,
+ <0xf2200000 0x800>;
+ reg-names = "regs", "sram";
+ interrupts = <28>;
+ status = "okay";
+ };
+
+ ehci at a0000 {
+ compatible = "marvell,orion-ehci";
+ reg = <0xa0000 0x1000>;
+ interrupts = <12>;
+ status = "disabled";
+ };
};
};
--
1.8.5.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/4] ARM: mvebu: sort DT nodes by address
2013-12-12 15:25 ` [PATCH 0/4] ARM: mvebu: sort DT nodes by reg address Jason Cooper
` (2 preceding siblings ...)
2013-12-12 15:25 ` [PATCH 3/4] ARM: orion5x: " Jason Cooper
@ 2013-12-12 15:25 ` Jason Cooper
2013-12-14 22:27 ` [PATCH 0/4] ARM: mvebu: sort DT nodes by reg address Jason Cooper
2013-12-22 17:28 ` [PATCH] ARM: kirkwood: 6282: sort DT nodes by address Jason Cooper
5 siblings, 0 replies; 9+ messages in thread
From: Jason Cooper @ 2013-12-12 15:25 UTC (permalink / raw)
To: linux-arm-kernel
Prevent future unnecessary merge conflicts
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
---
arch/arm/boot/dts/armada-370-xp.dtsi | 176 +++++++++++++++++------------------
arch/arm/boot/dts/armada-370.dtsi | 74 +++++++--------
arch/arm/boot/dts/armada-xp.dtsi | 100 ++++++++++----------
3 files changed, 175 insertions(+), 175 deletions(-)
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index f2b6ae4f55d0..46a541e626e7 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -103,22 +103,52 @@
#size-cells = <1>;
ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>;
- mbusc: mbus-controller at 20000 {
- compatible = "marvell,mbus-controller";
- reg = <0x20000 0x100>, <0x20180 0x20>;
+ rtc at 10300 {
+ compatible = "marvell,orion-rtc";
+ reg = <0x10300 0x20>;
+ interrupts = <50>;
};
- mpic: interrupt-controller at 20000 {
- compatible = "marvell,mpic";
- #interrupt-cells = <1>;
- #size-cells = <1>;
- interrupt-controller;
- msi-controller;
+ spi0: spi at 10600 {
+ compatible = "marvell,orion-spi";
+ reg = <0x10600 0x28>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ cell-index = <0>;
+ interrupts = <30>;
+ clocks = <&coreclk 0>;
+ status = "disabled";
};
- coherency-fabric at 20200 {
- compatible = "marvell,coherency-fabric";
- reg = <0x20200 0xb0>, <0x21810 0x1c>;
+ spi1: spi at 10680 {
+ compatible = "marvell,orion-spi";
+ reg = <0x10680 0x28>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ cell-index = <1>;
+ interrupts = <92>;
+ clocks = <&coreclk 0>;
+ status = "disabled";
+ };
+
+ i2c0: i2c at 11000 {
+ compatible = "marvell,mv64xxx-i2c";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ interrupts = <31>;
+ timeout-ms = <1000>;
+ clocks = <&coreclk 0>;
+ status = "disabled";
+ };
+
+ i2c1: i2c at 11100 {
+ compatible = "marvell,mv64xxx-i2c";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ interrupts = <32>;
+ timeout-ms = <1000>;
+ clocks = <&coreclk 0>;
+ status = "disabled";
};
serial at 12000 {
@@ -146,25 +176,41 @@
clock-output-names = "nand";
};
+ mbusc: mbus-controller at 20000 {
+ compatible = "marvell,mbus-controller";
+ reg = <0x20000 0x100>, <0x20180 0x20>;
+ };
+
+ mpic: interrupt-controller at 20000 {
+ compatible = "marvell,mpic";
+ #interrupt-cells = <1>;
+ #size-cells = <1>;
+ interrupt-controller;
+ msi-controller;
+ };
+
+ coherency-fabric at 20200 {
+ compatible = "marvell,coherency-fabric";
+ reg = <0x20200 0xb0>, <0x21810 0x1c>;
+ };
+
timer at 20300 {
reg = <0x20300 0x30>, <0x21040 0x30>;
interrupts = <37>, <38>, <39>, <40>, <5>, <6>;
};
- sata at a0000 {
- compatible = "marvell,orion-sata";
- reg = <0xa0000 0x5000>;
- interrupts = <55>;
- clocks = <&gateclk 15>, <&gateclk 30>;
- clock-names = "0", "1";
+ usb at 50000 {
+ compatible = "marvell,orion-ehci";
+ reg = <0x50000 0x500>;
+ interrupts = <45>;
status = "disabled";
};
- mdio {
- #address-cells = <1>;
- #size-cells = <0>;
- compatible = "marvell,orion-mdio";
- reg = <0x72004 0x4>;
+ usb at 51000 {
+ compatible = "marvell,orion-ehci";
+ reg = <0x51000 0x500>;
+ interrupts = <46>;
+ status = "disabled";
};
eth0: ethernet at 70000 {
@@ -175,6 +221,13 @@
status = "disabled";
};
+ mdio {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "marvell,orion-mdio";
+ reg = <0x72004 0x4>;
+ };
+
eth1: ethernet at 74000 {
compatible = "marvell,armada-370-neta";
reg = <0x74000 0x4000>;
@@ -183,32 +236,25 @@
status = "disabled";
};
- i2c0: i2c at 11000 {
- compatible = "marvell,mv64xxx-i2c";
- #address-cells = <1>;
- #size-cells = <0>;
- interrupts = <31>;
- timeout-ms = <1000>;
- clocks = <&coreclk 0>;
+ sata at a0000 {
+ compatible = "marvell,orion-sata";
+ reg = <0xa0000 0x5000>;
+ interrupts = <55>;
+ clocks = <&gateclk 15>, <&gateclk 30>;
+ clock-names = "0", "1";
status = "disabled";
};
- i2c1: i2c at 11100 {
- compatible = "marvell,mv64xxx-i2c";
+ nand at d0000 {
+ compatible = "marvell,armada370-nand";
+ reg = <0xd0000 0x54>;
#address-cells = <1>;
- #size-cells = <0>;
- interrupts = <32>;
- timeout-ms = <1000>;
- clocks = <&coreclk 0>;
+ #size-cells = <1>;
+ interrupts = <113>;
+ clocks = <&coredivclk 0>;
status = "disabled";
};
- rtc at 10300 {
- compatible = "marvell,orion-rtc";
- reg = <0x10300 0x20>;
- interrupts = <50>;
- };
-
mvsdio at d4000 {
compatible = "marvell,orion-sdio";
reg = <0xd4000 0x200>;
@@ -220,52 +266,6 @@
cap-mmc-highspeed;
status = "disabled";
};
-
- usb at 50000 {
- compatible = "marvell,orion-ehci";
- reg = <0x50000 0x500>;
- interrupts = <45>;
- status = "disabled";
- };
-
- usb at 51000 {
- compatible = "marvell,orion-ehci";
- reg = <0x51000 0x500>;
- interrupts = <46>;
- status = "disabled";
- };
-
- spi0: spi at 10600 {
- compatible = "marvell,orion-spi";
- reg = <0x10600 0x28>;
- #address-cells = <1>;
- #size-cells = <0>;
- cell-index = <0>;
- interrupts = <30>;
- clocks = <&coreclk 0>;
- status = "disabled";
- };
-
- spi1: spi at 10680 {
- compatible = "marvell,orion-spi";
- reg = <0x10680 0x28>;
- #address-cells = <1>;
- #size-cells = <0>;
- cell-index = <1>;
- interrupts = <92>;
- clocks = <&coreclk 0>;
- status = "disabled";
- };
-
- nand at d0000 {
- compatible = "marvell,armada370-nand";
- reg = <0xd0000 0x54>;
- #address-cells = <1>;
- #size-cells = <1>;
- interrupts = <113>;
- clocks = <&coredivclk 0>;
- status = "disabled";
- };
};
};
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index 7a4b82e71aaf..0d8530c98cf5 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -91,11 +91,6 @@
};
internal-regs {
- system-controller at 18200 {
- compatible = "marvell,armada-370-xp-system-controller";
- reg = <0x18200 0x100>;
- };
-
L2: l2-cache {
compatible = "marvell,aurora-outer-cache";
reg = <0x08000 0x1000>;
@@ -103,8 +98,17 @@
wt-override;
};
- interrupt-controller at 20000 {
- reg = <0x20a00 0x1d0>, <0x21870 0x58>;
+ i2c0: i2c at 11000 {
+ reg = <0x11000 0x20>;
+ };
+
+ i2c1: i2c at 11100 {
+ reg = <0x11100 0x20>;
+ };
+
+ system-controller at 18200 {
+ compatible = "marvell,armada-370-xp-system-controller";
+ reg = <0x18200 0x100>;
};
pinctrl {
@@ -163,9 +167,11 @@
interrupts = <91>;
};
- timer at 20300 {
- compatible = "marvell,armada-370-timer";
- clocks = <&coreclk 2>;
+ gateclk: clock-gating-control at 18220 {
+ compatible = "marvell,armada-370-gating-clock";
+ reg = <0x18220 0x4>;
+ clocks = <&coreclk 0>;
+ #clock-cells = <1>;
};
coreclk: mvebu-sar at 18230 {
@@ -174,11 +180,28 @@
#clock-cells = <1>;
};
- gateclk: clock-gating-control at 18220 {
- compatible = "marvell,armada-370-gating-clock";
- reg = <0x18220 0x4>;
+ thermal at 18300 {
+ compatible = "marvell,armada370-thermal";
+ reg = <0x18300 0x4
+ 0x18304 0x4>;
+ status = "okay";
+ };
+
+ interrupt-controller at 20000 {
+ reg = <0x20a00 0x1d0>, <0x21870 0x58>;
+ };
+
+ timer at 20300 {
+ compatible = "marvell,armada-370-timer";
+ clocks = <&coreclk 2>;
+ };
+
+ usb at 50000 {
+ clocks = <&coreclk 0>;
+ };
+
+ usb at 51000 {
clocks = <&coreclk 0>;
- #clock-cells = <1>;
};
xor at 60800 {
@@ -218,29 +241,6 @@
dmacap,memset;
};
};
-
- i2c0: i2c at 11000 {
- reg = <0x11000 0x20>;
- };
-
- i2c1: i2c at 11100 {
- reg = <0x11100 0x20>;
- };
-
- usb at 50000 {
- clocks = <&coreclk 0>;
- };
-
- usb at 51000 {
- clocks = <&coreclk 0>;
- };
-
- thermal at 18300 {
- compatible = "marvell,armada370-thermal";
- reg = <0x18300 0x4
- 0x18304 0x4>;
- status = "okay";
- };
};
};
};
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 281c6447e872..4919fb82ac62 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -42,13 +42,14 @@
wt-override;
};
- interrupt-controller at 20000 {
- reg = <0x20a00 0x2d0>, <0x21070 0x58>;
+ i2c0: i2c at 11000 {
+ compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
+ reg = <0x11000 0x100>;
};
- armada-370-xp-pmsu at 22000 {
- compatible = "marvell,armada-370-xp-pmsu";
- reg = <0x22100 0x430>, <0x20800 0x20>;
+ i2c1: i2c at 11100 {
+ compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
+ reg = <0x11100 0x100>;
};
serial at 12200 {
@@ -68,10 +69,16 @@
status = "disabled";
};
- timer at 20300 {
- compatible = "marvell,armada-xp-timer";
- clocks = <&coreclk 2>, <&refclk>;
- clock-names = "nbclk", "fixed";
+ system-controller at 18200 {
+ compatible = "marvell,armada-370-xp-system-controller";
+ reg = <0x18200 0x500>;
+ };
+
+ gateclk: clock-gating-control at 18220 {
+ compatible = "marvell,armada-xp-gating-clock";
+ reg = <0x18220 0x4>;
+ clocks = <&coreclk 0>;
+ #clock-cells = <1>;
};
coreclk: mvebu-sar at 18230 {
@@ -80,6 +87,13 @@
#clock-cells = <1>;
};
+ thermal at 182b0 {
+ compatible = "marvell,armadaxp-thermal";
+ reg = <0x182b0 0x4
+ 0x184d0 0x4>;
+ status = "okay";
+ };
+
cpuclk: clock-complex at 18700 {
#clock-cells = <1>;
compatible = "marvell,armada-xp-cpu-clock";
@@ -87,16 +101,19 @@
clocks = <&coreclk 1>;
};
- gateclk: clock-gating-control at 18220 {
- compatible = "marvell,armada-xp-gating-clock";
- reg = <0x18220 0x4>;
- clocks = <&coreclk 0>;
- #clock-cells = <1>;
+ interrupt-controller at 20000 {
+ reg = <0x20a00 0x2d0>, <0x21070 0x58>;
};
- system-controller at 18200 {
- compatible = "marvell,armada-370-xp-system-controller";
- reg = <0x18200 0x500>;
+ timer at 20300 {
+ compatible = "marvell,armada-xp-timer";
+ clocks = <&coreclk 2>, <&refclk>;
+ clock-names = "nbclk", "fixed";
+ };
+
+ armada-370-xp-pmsu at 22000 {
+ compatible = "marvell,armada-370-xp-pmsu";
+ reg = <0x22100 0x430>, <0x20800 0x20>;
};
eth2: ethernet at 30000 {
@@ -107,6 +124,22 @@
status = "disabled";
};
+ usb at 50000 {
+ clocks = <&gateclk 18>;
+ };
+
+ usb at 51000 {
+ clocks = <&gateclk 19>;
+ };
+
+ usb at 52000 {
+ compatible = "marvell,orion-ehci";
+ reg = <0x52000 0x500>;
+ interrupts = <47>;
+ clocks = <&gateclk 20>;
+ status = "disabled";
+ };
+
xor at 60900 {
compatible = "marvell,orion-xor";
reg = <0x60900 0x100
@@ -146,39 +179,6 @@
dmacap,memset;
};
};
-
- i2c0: i2c@11000 {
- compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
- reg = <0x11000 0x100>;
- };
-
- i2c1: i2c at 11100 {
- compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
- reg = <0x11100 0x100>;
- };
-
- usb at 50000 {
- clocks = <&gateclk 18>;
- };
-
- usb at 51000 {
- clocks = <&gateclk 19>;
- };
-
- usb at 52000 {
- compatible = "marvell,orion-ehci";
- reg = <0x52000 0x500>;
- interrupts = <47>;
- clocks = <&gateclk 20>;
- status = "disabled";
- };
-
- thermal at 182b0 {
- compatible = "marvell,armadaxp-thermal";
- reg = <0x182b0 0x4
- 0x184d0 0x4>;
- status = "okay";
- };
};
};
--
1.8.5.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 0/4] ARM: mvebu: sort DT nodes by reg address
2013-12-12 15:25 ` [PATCH 0/4] ARM: mvebu: sort DT nodes by reg address Jason Cooper
` (3 preceding siblings ...)
2013-12-12 15:25 ` [PATCH 4/4] ARM: mvebu: " Jason Cooper
@ 2013-12-14 22:27 ` Jason Cooper
2013-12-22 17:28 ` [PATCH] ARM: kirkwood: 6282: sort DT nodes by address Jason Cooper
5 siblings, 0 replies; 9+ messages in thread
From: Jason Cooper @ 2013-12-14 22:27 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Dec 12, 2013 at 03:25:15PM +0000, Jason Cooper wrote:
> Olof, all,
>
> I love December! I'm getting around to some of the items on my -onice folder.
> Namely, this one:
>
> On Thu, Aug 15, 2013 at 11:15:00PM -0700, Olof Johansson wrote:
> > On Wed, Aug 14, 2013 at 02:59:45PM -0400, Jason Cooper wrote:
> ...
> > > diff --cc arch/arm/boot/dts/kirkwood.dtsi
> > > index 70f414d,1d6921d..6489b98
> > > --- a/arch/arm/boot/dts/kirkwood.dtsi
> > > +++ b/arch/arm/boot/dts/kirkwood.dtsi
> > > @@@ -47,11 -30,30 +40,35 @@@
> > > #address-cells = <1>;
> > > #size-cells = <1>;
> > >
> > > + timer: timer at 20300 {
> > > + compatible = "marvell,orion-timer";
> > > + reg = <0x20300 0x20>;
> > > + interrupt-parent = <&bridge_intc>;
> > > + interrupts = <1>, <2>;
> > > + clocks = <&core_clk 0>;
> > > + };
> > > +
> > > + intc: main-interrupt-ctrl at 20200 {
> > > + compatible = "marvell,orion-intc";
> > > + interrupt-controller;
> > > + #interrupt-cells = <1>;
> > > + reg = <0x20200 0x10>, <0x20210 0x10>;
> > > + };
> > > +
> > > + bridge_intc: bridge-interrupt-ctrl at 20110 {
> > > + compatible = "marvell,orion-bridge-intc";
> > > + interrupt-controller;
> > > + #interrupt-cells = <1>;
> > > + reg = <0x20110 0x8>;
> > > + interrupts = <1>;
> > > + marvell,#interrupts = <6>;
> > > + };
> > > +
> > > + mbusc: mbus-controller at 20000 {
> > > + compatible = "marvell,mbus-controller";
> > > + reg = <0x20000 0x80>, <0x1500 0x20>;
> > > + };
> > > +
> > > core_clk: core-clocks at 10030 {
> > > compatible = "marvell,kirkwood-core-clock";
> > > reg = <0x10030 0x4>;
> >
> > This file is a real mess. :( Nothing is sorted properly under the ocp/ bus.
> > It's common to sort by memory address. Or I'd even take alphabetically if
> > there was a good reason to do so. Just some order of some kind.
>
> Done.
>
> thx,
>
> Jason.
>
> Jason Cooper (4):
> ARM: kirkwood: sort dt nodes by address
> ARM: dove: sort DT nodes by address
> ARM: orion5x: sort DT nodes by address
> ARM: mvebu: sort DT nodes by address
>
> arch/arm/boot/dts/armada-370-xp.dtsi | 176 ++++++-------
> arch/arm/boot/dts/armada-370.dtsi | 74 +++---
> arch/arm/boot/dts/armada-xp.dtsi | 100 +++----
> arch/arm/boot/dts/dove.dtsi | 496 +++++++++++++++++------------------
> arch/arm/boot/dts/kirkwood.dtsi | 140 +++++-----
> arch/arm/boot/dts/orion5x.dtsi | 106 ++++----
> 6 files changed, 546 insertions(+), 546 deletions(-)
Series applied to mvebu/dt
And Jason, next time, don't take so long. :)
thx,
Jason.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] ARM: kirkwood: 6282: sort DT nodes by address
2013-12-12 15:25 ` [PATCH 0/4] ARM: mvebu: sort DT nodes by reg address Jason Cooper
` (4 preceding siblings ...)
2013-12-14 22:27 ` [PATCH 0/4] ARM: mvebu: sort DT nodes by reg address Jason Cooper
@ 2013-12-22 17:28 ` Jason Cooper
5 siblings, 0 replies; 9+ messages in thread
From: Jason Cooper @ 2013-12-22 17:28 UTC (permalink / raw)
To: linux-arm-kernel
We recently sorted the nodes in dove, orion5x, kirkwood, and armada
370/xp. However, I missed this file. -6281 is fine.
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
---
This is just an fyi, Andrew's patch adding the phy nodes brought this to my
attention. I've applied this to mvebu/dt.
thx,
Jason.
arch/arm/boot/dts/kirkwood-6282.dtsi | 35 +++++++++++++++++------------------
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
index a4fec0432168..2902e0d7971d 100644
--- a/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -104,6 +104,12 @@
};
};
+ thermal at 10078 {
+ compatible = "marvell,kirkwood-thermal";
+ reg = <0x10078 0x4>;
+ status = "okay";
+ };
+
rtc at 10300 {
compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
reg = <0x10300 0x20>;
@@ -111,6 +117,17 @@
clocks = <&gate_clk 7>;
};
+ i2c at 11100 {
+ compatible = "marvell,mv64xxx-i2c";
+ reg = <0x11100 0x20>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ interrupts = <32>;
+ clock-frequency = <100000>;
+ clocks = <&gate_clk 7>;
+ status = "disabled";
+ };
+
sata at 80000 {
compatible = "marvell,orion-sata";
reg = <0x80000 0x5000>;
@@ -135,23 +152,5 @@
cap-mmc-highspeed;
status = "disabled";
};
-
- thermal at 10078 {
- compatible = "marvell,kirkwood-thermal";
- reg = <0x10078 0x4>;
- status = "okay";
- };
-
- i2c at 11100 {
- compatible = "marvell,mv64xxx-i2c";
- reg = <0x11100 0x20>;
- #address-cells = <1>;
- #size-cells = <0>;
- interrupts = <32>;
- clock-frequency = <100000>;
- clocks = <&gate_clk 7>;
- status = "disabled";
- };
-
};
};
--
1.8.5.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2013-12-22 17:28 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-14 18:59 [GIT PULL] ARM: mvebu: driver changes for v3.12 Jason Cooper
2013-08-16 6:15 ` Olof Johansson
2013-12-12 15:25 ` [PATCH 0/4] ARM: mvebu: sort DT nodes by reg address Jason Cooper
2013-12-12 15:25 ` [PATCH 1/4] ARM: kirkwood: sort dt nodes by address Jason Cooper
2013-12-12 15:25 ` [PATCH 2/4] ARM: dove: sort DT " Jason Cooper
2013-12-12 15:25 ` [PATCH 3/4] ARM: orion5x: " Jason Cooper
2013-12-12 15:25 ` [PATCH 4/4] ARM: mvebu: " Jason Cooper
2013-12-14 22:27 ` [PATCH 0/4] ARM: mvebu: sort DT nodes by reg address Jason Cooper
2013-12-22 17:28 ` [PATCH] ARM: kirkwood: 6282: sort DT nodes by address Jason Cooper
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).