Commit 34a30090 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Jason Cooper

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: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 7f69f8a4
...@@ -35,13 +35,22 @@ MBUS_ID(0x03, 0x01) 0 0xf5000000 0x10000 /* crypto sram */ ...@@ -35,13 +35,22 @@ MBUS_ID(0x03, 0x01) 0 0xf5000000 0x10000 /* crypto sram */
controller = <&mbusc>; controller = <&mbusc>;
pcie-mem-aperture = <0xe0000000 0x10000000>; /* 256 MiB memory space */ pcie-mem-aperture = <0xe0000000 0x10000000>; /* 256 MiB memory space */
pcie-io-aperture = <0xf2000000 0x100000>; /* 1 MiB I/O 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 { ocp@f1000000 {
compatible = "simple-bus"; compatible = "simple-bus";
ranges = <0x00000000 0xf1000000 0x0100000 ranges = <0x00000000 0xf1000000 0x0100000
0xf4000000 0xf4000000 0x0000400 0xf4000000 0xf4000000 0x0000400>;
0xf5000000 0xf5000000 0x0000400>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
...@@ -222,16 +231,6 @@ i2c@11000 { ...@@ -222,16 +231,6 @@ i2c@11000 {
status = "disabled"; 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 { mdio: mdio-bus@72004 {
compatible = "marvell,orion-mdio"; compatible = "marvell,orion-mdio";
#address-cells = <1>; #address-cells = <1>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment