summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-06-28 20:09:03 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-06-28 20:09:03 -0700
commitf24495509766f2f5a0f2cebae098fd3258ca06f0 (patch)
treefde1cb5494fc5a148dd29a1b08424b4937200bb9 /arch/arm
parent17fbca8726e6c253aa82d000d2f57ae6c69bbe4e (diff)
parent2ccfe717e456ef2086c7e9d2bb6ac0ca82e2156b (diff)
Merge "ARM: dts: msm: update rmtfs shared memory address for SDM660/630"
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/qcom/sdm630.dtsi4
-rw-r--r--arch/arm/boot/dts/qcom/sdm660.dtsi4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/qcom/sdm630.dtsi b/arch/arm/boot/dts/qcom/sdm630.dtsi
index d492dba8cdac..56a6d5105568 100644
--- a/arch/arm/boot/dts/qcom/sdm630.dtsi
+++ b/arch/arm/boot/dts/qcom/sdm630.dtsi
@@ -1280,9 +1280,9 @@
};
};
- qcom,rmtfs_sharedmem@0 {
+ qcom,rmtfs_sharedmem@85e00000 {
compatible = "qcom,sharedmem-uio";
- reg = <0x0 0x200000>;
+ reg = <0x85e00000 0x200000>;
reg-names = "rmtfs";
qcom,client-id = <0x00000001>;
};
diff --git a/arch/arm/boot/dts/qcom/sdm660.dtsi b/arch/arm/boot/dts/qcom/sdm660.dtsi
index d1e4cc2b192a..207cc57e8e49 100644
--- a/arch/arm/boot/dts/qcom/sdm660.dtsi
+++ b/arch/arm/boot/dts/qcom/sdm660.dtsi
@@ -1511,9 +1511,9 @@
};
};
- qcom,rmtfs_sharedmem@0 {
+ qcom,rmtfs_sharedmem@85e00000 {
compatible = "qcom,sharedmem-uio";
- reg = <0x0 0x200000>;
+ reg = <0x85e00000 0x200000>;
reg-names = "rmtfs";
qcom,client-id = <0x00000001>;
};