Merge remote branch 'jwb/next' into next

3 files changed, 24 insertions, 1 deletions

diff --git a/arch/powerpc/boot/dts/canyonlands.dts b/arch/powerpc/boot/dts/canyonlands.dts
index 22dd6ae84da0..3dc75deafbb3 100644
--- a/arch/powerpc/boot/dts/canyonlands.dts
+++ b/arch/powerpc/boot/dts/canyonlands.dts
@@ -143,6 +143,11 @@
                         interrupts = <0x1d 0x4>;
                 };
 
+                HWRNG: hwrng@110000 {
+                        compatible = "amcc,ppc460ex-rng", "ppc4xx-rng";
+                        reg = <4 0x00110000 0x50>;
+                };
+
                 MAL0: mcmal {
                         compatible = "ibm,mcmal-460ex", "ibm,mcmal2";
                         dcr-reg = <0x180 0x062>;
diff --git a/arch/powerpc/boot/dts/glacier.dts b/arch/powerpc/boot/dts/glacier.dts
index e618fc4cbc9e..2000060386d7 100644
--- a/arch/powerpc/boot/dts/glacier.dts
+++ b/arch/powerpc/boot/dts/glacier.dts
@@ -130,12 +130,18 @@
                 };
 
                 CRYPTO: crypto@180000 {
-                        compatible = "amcc,ppc460gt-crypto", "amcc,ppc4xx-crypto";
+                        compatible = "amcc,ppc460gt-crypto", "amcc,ppc460ex-crypto",
+                                "amcc,ppc4xx-crypto";
                         reg = <4 0x00180000 0x80400>;
                         interrupt-parent = <&UIC0>;
                         interrupts = <0x1d 0x4>;
                 };
 
+                HWRNG: hwrng@110000 {
+                        compatible = "amcc,ppc460ex-rng", "ppc4xx-rng";
+                        reg = <4 0x00110000 0x50>;
+                };
+
                 MAL0: mcmal {
                         compatible = "ibm,mcmal-460gt", "ibm,mcmal2";
                         dcr-reg = <0x180 0x062>;
diff --git a/arch/powerpc/boot/dts/sequoia.dts b/arch/powerpc/boot/dts/sequoia.dts
index 739dd0da2416..b1d329246b08 100644
--- a/arch/powerpc/boot/dts/sequoia.dts
+++ b/arch/powerpc/boot/dts/sequoia.dts
@@ -110,6 +110,18 @@
                         dcr-reg = <0x010 0x002>;
                 };
 
+                CRYPTO: crypto@e0100000 {
+                        compatible = "amcc,ppc440epx-crypto","amcc,ppc4xx-crypto";
+                        reg = <0 0xE0100000 0x80400>;
+                        interrupt-parent = <&UIC0>;
+                        interrupts = <0x17 0x4>;
+                };
+
+                rng@e0120000 {
+                        compatible = "amcc,ppc440epx-rng","amcc,ppc4xx-rng";
+                        reg = <0 0xE0120000 0x150>;
+                };
+
                 DMA0: dma {
                         compatible = "ibm,dma-440epx", "ibm,dma-4xx";
                         dcr-reg = <0x100 0x027>;