diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2020-01-27 17:56:26 +0200 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-01-27 17:56:26 +0200 |
| commit | 22d88e1acee89743969b02a4f79afbbde4ce7e34 (patch) | |
| tree | 2a9b46904d6f830283432ef866e49f987d151cc9 /arch/arm | |
| parent | 86caabd611d82b4825d508938b15197041ba5f18 (diff) | |
| parent | d8b4ad87cc6c4e6419815a70cb050b818a4259a2 (diff) | |
Merge tag 'LA.UM.8.4.r1-05000-8x98.0' of https://source.codeaurora.org/quic/la/kernel/msm-4.4 into lineage-17.1-caf-msm8998
* tag 'LA.UM.8.4.r1-05000-8x98.0' of https://source.codeaurora.org/quic/la/kernel/msm-4.4:
msm: ais: fix camif_cfg programming
ARM: dts: msm: remove CARVEOUT ION for msm8996 ivi multi-gvm vplatform
diag: Update diag logging mask definitions
media: v4l2loopback: fix for dereferenced error
soc: qcom: hab: run the dispatcher's tasklet w/ high priority
Change-Id: I29dc15b5cea65c7bfce5b8ff2202d425165bdc07
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-lv-mt.dts | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-lv-mt.dts b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-lv-mt.dts index 8b2373e2c079..c9e0bc54e469 100644 --- a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-lv-mt.dts +++ b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-lv-mt.dts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, The Linux Foundation. All rights reserved. +/* Copyright (c) 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 @@ -83,14 +83,18 @@ }; }; +&ion { + /delete-node/ qcom,ion-heap@25; + + system_heap: qcom,ion-heap@25 { + reg = <25>; + qcom,ion-heap-type = "SYSTEM"; + }; +}; + &reserved_memory { pmem_shared: pmem_shared_region@d0000000 { reg = <0 0xd0000000 0 0x20000000>; label = "pmem_shared_mem"; }; - - ion_system: ion_system_region@100000000 { - reg = <0x1 0x60000000 0 0x10000000>; - label = "ion_system_mem"; - }; }; |