From 9a8c993f6a70b8931a431ac1e3add78022cd77b0 Mon Sep 17 00:00:00 2001
From: Mike Williams <mike@mikebwilliams.com>
Date: Wed, 22 Jun 2011 06:09:43 +0000
Subject: [PATCH] --- yaml --- r: 259119 b: refs/heads/master c:
 573084995966f667d89087b0e6d6f610ed3aae87 h: refs/heads/master i:   259117:
 58362b852fabdb9126812819b550a85da2c24f96   259115:
 d1512313a92c659b2c55e12dabe9cad18da2df5d   259111:
 2440a415690f80dedd821583a664aad4fe23c516   259103:
 6a5d924689243efdd94628502bc39bb07bd43bfc v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/powerpc/boot/dts/canyonlands.dts | 5 +++++
 trunk/arch/powerpc/boot/dts/glacier.dts     | 8 +++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 78fe2efb6020..7e6edbb43776 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61d1baaea25dbcc22e03604f4d75e151853f574e
+refs/heads/master: 573084995966f667d89087b0e6d6f610ed3aae87
diff --git a/trunk/arch/powerpc/boot/dts/canyonlands.dts b/trunk/arch/powerpc/boot/dts/canyonlands.dts
index 22dd6ae84da0..3dc75deafbb3 100644
--- a/trunk/arch/powerpc/boot/dts/canyonlands.dts
+++ b/trunk/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/trunk/arch/powerpc/boot/dts/glacier.dts b/trunk/arch/powerpc/boot/dts/glacier.dts
index e618fc4cbc9e..2000060386d7 100644
--- a/trunk/arch/powerpc/boot/dts/glacier.dts
+++ b/trunk/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>;