diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-03-13 10:21:41 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-03-13 10:21:40 -0700 |
| commit | e47cd28f0329f32dfc16f408ae78ffac5a97741a (patch) | |
| tree | 24677505845ff4e582e0a6f17f80cc7a2b5c00d3 | |
| parent | e556e69bfb9134cdcc7e81fe1ded4725249cd216 (diff) | |
| parent | 961232b0344a82da98870c2cffeb9f49fa5a4b16 (diff) | |
Merge "ARM: dts: msm: Modify memory allocation for diag"
| -rw-r--r-- | arch/arm/boot/dts/qcom/sdm630.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/sdm660.dtsi | 4 |
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 808421c763ea..fe5b54515a35 100644 --- a/arch/arm/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm/boot/dts/qcom/sdm630.dtsi @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. +/* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -618,7 +618,7 @@ compatible = "qcom,memshare-peripheral"; qcom,peripheral-size = <0x0>; qcom,client-id = <1>; - qcom,allocate-boot-time; + qcom,allocate-on-request; label = "modem"; }; }; diff --git a/arch/arm/boot/dts/qcom/sdm660.dtsi b/arch/arm/boot/dts/qcom/sdm660.dtsi index 5a4b7c1aaa80..8db3c1a02925 100644 --- a/arch/arm/boot/dts/qcom/sdm660.dtsi +++ b/arch/arm/boot/dts/qcom/sdm660.dtsi @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. +/* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -648,7 +648,7 @@ compatible = "qcom,memshare-peripheral"; qcom,peripheral-size = <0x0>; qcom,client-id = <1>; - qcom,allocate-boot-time; + qcom,allocate-on-request; label = "modem"; }; }; |