summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-01-18 05:31:18 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-01-18 05:31:17 -0800
commit733bc86afc51b960d9c474fd9b2e43faf91913f2 (patch)
tree07e67ed8ef471fc209a66e5a3a3a9c38616a384a
parentd9ac8efbd96e3d5106203f5faab87a38f4f87860 (diff)
parentb3ddc510a0565f2f9c5c2a30e81d1363fc9cacb5 (diff)
Merge "ARM: dts: msm: Update memory map for msm8998"
-rw-r--r--arch/arm/boot/dts/qcom/msm8998.dtsi24
1 files changed, 15 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8998.dtsi b/arch/arm/boot/dts/qcom/msm8998.dtsi
index cb3d1fee1f48..cfdbf98af76e 100644
--- a/arch/arm/boot/dts/qcom/msm8998.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998.dtsi
@@ -286,34 +286,40 @@
reg = <0 0x85800000 0 0x3700000>;
};
- pil_slpi_mem: pil_slpi_region@93800000 {
+ pil_ipa_gpu_mem: pil_ipa_gpu_region@95000000 {
compatible = "removed-dma-pool";
no-map;
- reg = <0 0x93800000 0 0xf00000>;
+ reg = <0 0x95000000 0 0x100000>;
};
- pil_video_mem: pil_video_region@93300000 {
+ pil_slpi_mem: pil_slpi_region@94100000 {
compatible = "removed-dma-pool";
no-map;
- reg = <0 0x93300000 0 0x500000>;
+ reg = <0 0x94100000 0 0xf00000>;
};
- pil_adsp_mem: pil_adsp_region@91900000 {
+ pil_video_mem: pil_video_region@93c00000 {
compatible = "removed-dma-pool";
no-map;
- reg = <0 0x91900000 0 0x1a00000>;
+ reg = <0 0x93c00000 0 0x500000>;
};
- modem_mem: modem_region@8ac00000 {
+ modem_mem: modem_region@8cc00000 {
compatible = "removed-dma-pool";
no-map;
- reg = <0 0x8ac00000 0 0x6d00000>;
+ reg = <0 0x8cc00000 0 0x7000000>;
+ };
+
+ pil_adsp_mem: pil_adsp_region@0x8b200000 {
+ compatible = "removed-dma-pool";
+ no-map;
+ reg = <0 0x8b200000 0 0x1a00000>;
};
spss_mem: spss_region@8ab00000 { /* for SPSS-PIL */
compatible = "removed-dma-pool";
no-map;
- reg = <0 0x8ab00000 0 0x100000>;
+ reg = <0 0x8ab00000 0 0x700000>;
};
adsp_mem: adsp_region {