evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ARM: dts: msm: peripheral_mem carveout for msmcobalt"

Browse source
This commit is contained in:
Linux Build Service Account 2016-07-15 20:03:32 -07:00 • committed by Gerrit - the friendly Code Review server
commit 4e24c748ee
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
arch/arm/boot/dts/qcom/msmcobalt.dtsi
View file

@ -262,10 +262,22 @@
reg = <0 0x85800000 0 0x3700000>;
};
peripheral_mem: peripheral_region@91900000 {
pil_slpi_mem: pil_slpi_region@93800000 {
compatible = "removed-dma-pool";
no-map;
reg = <0 0x91900000 0 0x2e00000>;
reg = <0 0x93800000 0 0xf00000>;
};
pil_video_mem: pil_video_region@93300000 {
compatible = "removed-dma-pool";
no-map;
reg = <0 0x93300000 0 0x500000>;
};
pil_adsp_mem: pil_adsp_region@91900000 {
compatible = "removed-dma-pool";
no-map;
reg = <0 0x91900000 0 0x1a00000>;
};
modem_mem: modem_region@8ac00000 {
@ -1993,7 +2005,7 @@
status = "ok";
qcom,ssctl-instance-id = <0x14>;
qcom,firmware-name = "adsp";
memory-region = <&peripheral_mem>;
memory-region = <&pil_adsp_mem>;
/* GPIO inputs from lpass */
qcom,gpio-err-fatal = <&smp2pgpio_ssr_smp2p_2_in 0 0>;
@ -2473,7 +2485,7 @@
qcom,ssctl-instance-id = <0x16>;
qcom,firmware-name = "slpi";
status = "ok";
memory-region = <&peripheral_mem>;
memory-region = <&pil_slpi_mem>;
/* GPIO inputs from ssc */
qcom,gpio-err-fatal = <&smp2pgpio_ssr_smp2p_3_in 0 0>;
@ -2506,7 +2518,7 @@
qcom,pas-id = <9>;
qcom,proxy-timeout-ms = <10000>;
qcom,firmware-name = "venus";
memory-region = <&peripheral_mem>;
memory-region = <&pil_video_mem>;
status = "ok";
};