commit 5a62dd4a7aa4378d47a451b1b4216651657ee18b
author Linux Build Service Account <lnxbuild@localhost> Sun Aug 12 13:30:03 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Sun Aug 12 13:30:03 2012 -0700
tree 286448885f77b7b2668f67d54b06b609266b001a
parent 55e0edc14ac9b9a4fa3500c086e71824d767b18c
parent c77e4a6b28173ce34f5fd95517589c9550d5428b

Merge "msm: watchdog: Get the base and irq from platform data" into msm-3.4

arch/arm/boot/dts/msm8974.dtsi

diff --git a/arch/arm/boot/dts/msm8974.dtsi b/arch/arm/boot/dts/msm8974.dtsi
index 4c4510c..0b7d2c5 100644
--- a/arch/arm/boot/dts/msm8974.dtsi
+++ b/arch/arm/boot/dts/msm8974.dtsi
@@ -685,16 +685,18 @@
 		compatible = "qcom,qcedev";
 		reg = <0xfd440000 0x20000>,
 		      <0xfd444000 0x8000>;
+		reg-names = "crypto-base","crypto-bam-base";
 		interrupts = <0 235 0>;
-		qcom,bam-pipes = <0>;
+		qcom,bam-pipe-pair = <0>;
 	};
 
         qcom,qcrypto@fd444000 {
 		compatible = "qcom,qcrypto";
 		reg = <0xfd440000 0x20000>,
 		      <0xfd444000 0x8000>;
+		reg-names = "crypto-base","crypto-bam-base";
 		interrupts = <0 235 0>;
-		qcom,bam-pipes = <1>;
+		qcom,bam-pipe-pair = <1>;
 	};
 
 	qcom,usbbam@f9304000 {