diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-30 14:36:03 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-30 14:36:03 +1000 |
| commit | 3a1a8acf690873f0ee2d8a648c2ec185f4294bd2 (patch) | |
| tree | 4cd633c0836f7bb30c3ce28d9b85ac0e5c21a7e2 /arch/powerpc/boot/dts/mpc836x_rdk.dts | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
| parent | cf0d19fb3032ebf2cf8e5217da00f51dc025aa8e (diff) | |
| download | kernel_replicant_linux-3a1a8acf690873f0ee2d8a648c2ec185f4294bd2.tar.gz kernel_replicant_linux-3a1a8acf690873f0ee2d8a648c2ec185f4294bd2.tar.bz2 kernel_replicant_linux-3a1a8acf690873f0ee2d8a648c2ec185f4294bd2.zip | |
Merge commit 'kumar/kumar-next'
Diffstat (limited to 'arch/powerpc/boot/dts/mpc836x_rdk.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc836x_rdk.dts | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/arch/powerpc/boot/dts/mpc836x_rdk.dts b/arch/powerpc/boot/dts/mpc836x_rdk.dts index 8acd1d6577f2..89c9202f8bd7 100644 --- a/arch/powerpc/boot/dts/mpc836x_rdk.dts +++ b/arch/powerpc/boot/dts/mpc836x_rdk.dts @@ -149,18 +149,14 @@ }; crypto@30000 { - compatible = "fsl,sec2-crypto"; + compatible = "fsl,sec2.0"; reg = <0x30000 0x10000>; - interrupts = <11 8>; + interrupts = <11 0x8>; interrupt-parent = <&ipic>; - num-channels = <4>; - channel-fifo-len = <24>; - exec-units-mask = <0x7e>; - /* - * desc mask is for rev1.x, we need runtime fixup - * for >=2.x - */ - descriptor-types-mask = <0x1010ebf>; + fsl,num-channels = <4>; + fsl,channel-fifo-len = <24>; + fsl,exec-units-mask = <0x7e>; + fsl,descriptor-types-mask = <0x01010ebf>; }; ipic: interrupt-controller@700 { |