diff options
| author | Jason Gunthorpe <jgunthorpe@obsidianresearch.com> | 2013-09-17 20:43:09 +0200 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-10-01 18:34:15 +0200 |
| commit | 34a300909e5e795500fcf7d3b971751fc65ed67b (patch) | |
| tree | 34199702bc456f426931897278e965f253a7d372 /arch/arm | |
| parent | ARM: kirkwood: Remove kirkwood_setup_wins and rely on the DT binding (diff) | |
| download | linux-34a300909e5e795500fcf7d3b971751fc65ed67b.tar.xz linux-34a300909e5e795500fcf7d3b971751fc65ed67b.zip | |
ARM: kirkwood: Move the crypto node under the mbus node
There should be no nodes that are not children of the mbus. Move
the crypto node under the mbus.
Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/kirkwood.dtsi | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi index d1bbe955b439..76b16271362a 100644 --- a/arch/arm/boot/dts/kirkwood.dtsi +++ b/arch/arm/boot/dts/kirkwood.dtsi @@ -35,13 +35,22 @@ controller = <&mbusc>; pcie-mem-aperture = <0xe0000000 0x10000000>; /* 256 MiB memory space */ pcie-io-aperture = <0xf2000000 0x100000>; /* 1 MiB I/O space */ + + crypto@0301 { + compatible = "marvell,orion-crypto"; + reg = <MBUS_ID(0xf0, 0x01) 0x30000 0x10000>, + <MBUS_ID(0x03, 0x01) 0 0x800>; + reg-names = "regs", "sram"; + interrupts = <22>; + clocks = <&gate_clk 17>; + status = "okay"; + }; }; ocp@f1000000 { compatible = "simple-bus"; ranges = <0x00000000 0xf1000000 0x0100000 - 0xf4000000 0xf4000000 0x0000400 - 0xf5000000 0xf5000000 0x0000400>; + 0xf4000000 0xf4000000 0x0000400>; #address-cells = <1>; #size-cells = <1>; @@ -222,16 +231,6 @@ status = "disabled"; }; - crypto@30000 { - compatible = "marvell,orion-crypto"; - reg = <0x30000 0x10000>, - <0xf5000000 0x800>; - reg-names = "regs", "sram"; - interrupts = <22>; - clocks = <&gate_clk 17>; - status = "okay"; - }; - mdio: mdio-bus@72004 { compatible = "marvell,orion-mdio"; #address-cells = <1>; |