diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2015-10-08 20:34:09 +0200 |
|---|---|---|
| committer | Andy Gross <agross@codeaurora.org> | 2015-10-14 21:51:40 +0200 |
| commit | d0bfd7c9b162612de55ca2d204403b90dc278db6 (patch) | |
| tree | f3bb0e4ca2aadceab29f0578857683d1ef02633b /arch/arm/boot/dts/qcom-msm8974.dtsi | |
| parent | soc: qcom: smd-rpm: Correct the active vs sleep state flagging (diff) | |
| download | linux-d0bfd7c9b162612de55ca2d204403b90dc278db6.tar.xz linux-d0bfd7c9b162612de55ca2d204403b90dc278db6.zip | |
soc: qcom: smem: Move RPM message ram out of smem DT node
SMEM is a software construct built on top of a DDR reserved region
and sometimes a device memory region called RPM message ram. Having
the RPM message ram in the smem DT node's reg property leads to the
smem node being located in different places depending on if the
message ram is being used or not. Let's add a qcom specific
property, qcom,rpm-msg-ram, and point to the device memory from
the SMEM node via a phandle. As SMEM is a software construct, it
really needs to reside at the root of the DT regardless of whether
it's using the message ram or not.
Cc: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Andy Gross <agross@codeaurora.org>
Diffstat (limited to 'arch/arm/boot/dts/qcom-msm8974.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/qcom-msm8974.dtsi | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index ab8e57250468..93e315053bdd 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -100,6 +100,15 @@ clock-frequency = <19200000>; }; + smem { + compatible = "qcom,smem"; + + memory-region = <&smem_region>; + qcom,rpm-msg-ram = <&rpm_msg_ram>; + + hwlocks = <&tcsr_mutex 3>; + }; + soc: soc { #address-cells = <1>; #size-cells = <1>; @@ -250,13 +259,9 @@ #hwlock-cells = <1>; }; - smem@fa00000 { - compatible = "qcom,smem"; - - memory-region = <&smem_region>; + rpm_msg_ram: memory@fc428000 { + compatible = "qcom,rpm-msg-ram"; reg = <0xfc428000 0x4000>; - - hwlocks = <&tcsr_mutex 3>; }; blsp1_uart2: serial@f991e000 { |