summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-01-13 08:07:52 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-01-13 08:07:51 -0800
commitf1d140f34cf432eca93ecc819d4100aca43c9a76 (patch)
tree03db2723f5c2ca1882db5db7a17e820038369306
parentb9fd387cd64495a426f5d3f966641f13913487b2 (diff)
parent6ae743ace4fdc7ff7b59ccc2b400f0ff23517fcc (diff)
Merge "ARM: dts: msm: Fix configurations for crypto and qrng on SDM660"
-rw-r--r--arch/arm/boot/dts/qcom/sdm660.dtsi8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/qcom/sdm660.dtsi b/arch/arm/boot/dts/qcom/sdm660.dtsi
index 32fbf7c6858b..c64c0c754030 100644
--- a/arch/arm/boot/dts/qcom/sdm660.dtsi
+++ b/arch/arm/boot/dts/qcom/sdm660.dtsi
@@ -1966,7 +1966,7 @@
reg = <0x1de0000 0x20000>,
<0x1dc4000 0x24000>;
reg-names = "crypto-base","crypto-bam-base";
- interrupts = <0 207 0>;
+ interrupts = <0 206 0>;
qcom,bam-pipe-pair = <1>;
qcom,ce-hw-instance = <0>;
qcom,ce-device = <0>;
@@ -1992,7 +1992,7 @@
reg = <0x1de0000 0x20000>,
<0x1dc4000 0x24000>;
reg-names = "crypto-base","crypto-bam-base";
- interrupts = <0 207 0>;
+ interrupts = <0 206 0>;
qcom,bam-pipe-pair = <2>;
qcom,ce-hw-instance = <0>;
qcom,ce-device = <0>;
@@ -2028,9 +2028,9 @@
hyplog-size-offset = <0x414>;
};
- qcom_rng: qrng@794000 {
+ qcom_rng: qrng@793000 {
compatible = "qcom,msm-rng";
- reg = <0x794000 0x1000>;
+ reg = <0x793000 0x1000>;
qcom,msm-rng-iface-clk;
qcom,no-qrng-config;
qcom,msm-bus,name = "msm-rng-noc";