Merge "ARM: dts: msm: Update memory map for msm8998"

This commit is contained in:
Linux Build Service Account 2017-01-18 05:31:18 -08:00 committed by Gerrit - the friendly Code Review server
commit 733bc86afc

View file

@ -286,34 +286,40 @@
reg = <0 0x85800000 0 0x3700000>; 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"; compatible = "removed-dma-pool";
no-map; 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"; compatible = "removed-dma-pool";
no-map; 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"; compatible = "removed-dma-pool";
no-map; 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"; compatible = "removed-dma-pool";
no-map; 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 */ spss_mem: spss_region@8ab00000 { /* for SPSS-PIL */
compatible = "removed-dma-pool"; compatible = "removed-dma-pool";
no-map; no-map;
reg = <0 0x8ab00000 0 0x100000>; reg = <0 0x8ab00000 0 0x700000>;
}; };
adsp_mem: adsp_region { adsp_mem: adsp_region {