diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-03-20 08:36:13 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-20 08:36:13 -0700 |
| commit | 8fbab95a997b87ea34d9ba92c488b25c8b98212c (patch) | |
| tree | 9b773a54cb00b1a18b39b2a1f0059955304116c4 | |
| parent | 1a92d1310cdf0d8f5775a58cdb48d6237314bd62 (diff) | |
| parent | b1b70877844c53938bcc2fc2349d30ca155f767b (diff) | |
Merge "ARM: dts: msm: set ION type to SYSTEM for msm8996 telematics"
| -rw-r--r-- | arch/arm/boot/dts/qcom/vplatform-lfv-ion.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-telematics.dts | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-ion.dtsi b/arch/arm/boot/dts/qcom/vplatform-lfv-ion.dtsi index 8f7773a87816..542b5a814e78 100644 --- a/arch/arm/boot/dts/qcom/vplatform-lfv-ion.dtsi +++ b/arch/arm/boot/dts/qcom/vplatform-lfv-ion.dtsi @@ -1,4 +1,4 @@ -/* Copyright (c) 2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2017-2018, 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 @@ -11,7 +11,7 @@ */ &soc { - qcom,ion { + ion: qcom,ion { compatible = "qcom,msm-ion"; #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-telematics.dts b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-telematics.dts index 94cfabf78d82..cd8e49244b24 100644 --- a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-telematics.dts +++ b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-telematics.dts @@ -28,6 +28,15 @@ qcom,msm-id = <246 0x0>; }; +&ion { + /delete-node/ qcom,ion-heap@25; + + system_heap: qcom,ion-heap@25 { + reg = <25>; + qcom,ion-heap-type = "SYSTEM"; + }; +}; + &reserved_memory { modem_mem: modem_region@88800000 { compatible = "removed-dma-pool"; @@ -48,11 +57,6 @@ alignment = <0 0x100000>; size = <0 0x400000>; }; - - ion_system: ion_system_region@ff000000 { - reg = <0 0xff000000 0 0x00400000>; - label = "ion_system_mem"; - }; }; &soc { |