diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-11-10 15:14:42 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-10 15:14:42 -0800 |
| commit | 8a9006341de00570189704d327ee4a6da4f0d3b8 (patch) | |
| tree | 0874e52da0dca2d35e9f2212ae1f59471417ea43 /arch | |
| parent | dd49b991fb561ce6553b3717c28c70474c2be2a4 (diff) | |
| parent | 670c302fbc2be2d81bad0f0a58107e9407a13b4f (diff) | |
Merge "ARM: dts: msm: Enable memory allocation for diag on cobalt"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt-mtp.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt.dtsi | 26 |
2 files changed, 30 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-mtp.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-mtp.dtsi index 88a584cf8964..0e8a45b70d97 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt-mtp.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt-mtp.dtsi @@ -469,6 +469,10 @@ qcom,panel-supply-entries = <&dsi_panel_pwr_supply>; }; +&mem_client_3_size { + qcom,peripheral-size = <0x500000>; +}; + &pmicobalt_haptics { status = "okay"; }; diff --git a/arch/arm/boot/dts/qcom/msmcobalt.dtsi b/arch/arm/boot/dts/qcom/msmcobalt.dtsi index cbddad0bbcb0..328ae458eb06 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt.dtsi @@ -2158,6 +2158,32 @@ qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_2_out 0 0>; }; + qcom,memshare { + compatible = "qcom,memshare"; + + qcom,client_1 { + compatible = "qcom,memshare-peripheral"; + qcom,peripheral-size = <0x200000>; + qcom,client-id = <0>; + qcom,allocate-boot-time; + label = "modem"; + }; + + qcom,client_2 { + compatible = "qcom,memshare-peripheral"; + qcom,peripheral-size = <0x300000>; + qcom,client-id = <2>; + label = "modem"; + }; + + mem_client_3_size: qcom,client_3 { + compatible = "qcom,memshare-peripheral"; + qcom,peripheral-size = <0x0>; + qcom,client-id = <1>; + label = "modem"; + }; + }; + pil_modem: qcom,mss@4080000 { compatible = "qcom,pil-q6v55-mss"; reg = <0x4080000 0x100>, |