Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: mvebu: use new bindings for existing crypto devices

The new bindings split the crypto and sram node in two separate devices.
Modify the existing crypto nodes to match the new representation.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

authored by

Boris Brezillon and committed by
Gregory CLEMENT
eb69e001 d716f2e8

+46 -20
+12 -3
arch/arm/boot/dts/dove.dtsi
··· 264 264 265 265 crypto: crypto-engine@30000 { 266 266 compatible = "marvell,orion-crypto"; 267 - reg = <0x30000 0x10000>, 268 - <0xffffe000 0x800>; 269 - reg-names = "regs", "sram"; 267 + reg = <0x30000 0x10000>; 268 + reg-names = "regs"; 270 269 interrupts = <31>; 271 270 clocks = <&gate_clk 15>; 271 + marvell,crypto-srams = <&crypto_sram>; 272 + marvell,crypto-sram-size = <0x800>; 272 273 status = "okay"; 273 274 }; 274 275 ··· 767 766 reg = <0x820000 0x1000>; 768 767 interrupts = <47>; 769 768 status = "disabled"; 769 + }; 770 + 771 + crypto_sram: sa-sram@ffffe000 { 772 + compatible = "mmio-sram"; 773 + reg = <0xffffe000 0x800>; 774 + clocks = <&gate_clk 15>; 775 + #address-cells = <1>; 776 + #size-cells = <1>; 770 777 }; 771 778 }; 772 779 };
+19 -10
arch/arm/boot/dts/kirkwood.dtsi
··· 40 40 pcie-mem-aperture = <0xe0000000 0x10000000>; /* 256 MiB memory space */ 41 41 pcie-io-aperture = <0xf2000000 0x100000>; /* 1 MiB I/O space */ 42 42 43 - cesa: crypto@0301 { 44 - compatible = "marvell,orion-crypto"; 45 - reg = <MBUS_ID(0xf0, 0x01) 0x30000 0x10000>, 46 - <MBUS_ID(0x03, 0x01) 0 0x800>; 47 - reg-names = "regs", "sram"; 48 - interrupts = <22>; 49 - clocks = <&gate_clk 17>; 50 - status = "okay"; 51 - }; 52 - 53 43 nand: nand@012f { 54 44 #address-cells = <1>; 55 45 #size-cells = <1>; ··· 54 64 pinctrl-0 = <&pmx_nand>; 55 65 pinctrl-names = "default"; 56 66 status = "disabled"; 67 + }; 68 + 69 + crypto_sram: sa-sram@0301 { 70 + compatible = "mmio-sram"; 71 + reg = <MBUS_ID(0x03, 0x01) 0x0 0x800>; 72 + clocks = <&gate_clk 17>; 73 + #address-cells = <1>; 74 + #size-cells = <1>; 57 75 }; 58 76 }; 59 77 ··· 247 249 interrupt-parent = <&bridge_intc>; 248 250 interrupts = <3>; 249 251 clocks = <&gate_clk 7>; 252 + status = "okay"; 253 + }; 254 + 255 + cesa: crypto@30000 { 256 + compatible = "marvell,orion-crypto"; 257 + reg = <0x30000 0x10000>; 258 + reg-names = "regs"; 259 + interrupts = <22>; 260 + clocks = <&gate_clk 17>; 261 + marvell,crypto-srams = <&crypto_sram>; 262 + marvell,crypto-sram-size = <0x800>; 250 263 status = "okay"; 251 264 }; 252 265
+15 -7
arch/arm/boot/dts/orion5x.dtsi
··· 212 212 status = "disabled"; 213 213 }; 214 214 215 + cesa: crypto@90000 { 216 + compatible = "marvell,orion-crypto"; 217 + reg = <0x90000 0x10000>; 218 + reg-names = "regs"; 219 + interrupts = <28>; 220 + marvell,crypto-srams = <&crypto_sram>; 221 + marvell,crypto-sram-size = <0x800>; 222 + status = "okay"; 223 + }; 224 + 215 225 ehci1: ehci@a0000 { 216 226 compatible = "marvell,orion-ehci"; 217 227 reg = <0xa0000 0x1000>; ··· 230 220 }; 231 221 }; 232 222 233 - cesa: crypto@90000 { 234 - compatible = "marvell,orion-crypto"; 235 - reg = <MBUS_ID(0xf0, 0x01) 0x90000 0x10000>, 236 - <MBUS_ID(0x09, 0x00) 0x0 0x800>; 237 - reg-names = "regs", "sram"; 238 - interrupts = <28>; 239 - status = "okay"; 223 + crypto_sram: sa-sram { 224 + compatible = "mmio-sram"; 225 + reg = <MBUS_ID(0x09, 0x00) 0x0 0x800>; 226 + #address-cells = <1>; 227 + #size-cells = <1>; 240 228 }; 241 229 }; 242 230 };