summaryrefslogtreecommitdiff
path: root/arch/arm64
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/boot/dts/qcom/msm8916-512mb-ion.dtsi8
-rw-r--r--arch/arm64/boot/dts/qcom/msm8916-512mb-memory.dtsi46
-rw-r--r--arch/arm64/boot/dts/qcom/msm8916-ion.dtsi11
-rw-r--r--arch/arm64/boot/dts/qcom/msm8916-memory.dtsi59
-rw-r--r--arch/arm64/boot/dts/qcom/msm8916.dtsi6
5 files changed, 59 insertions, 71 deletions
diff --git a/arch/arm64/boot/dts/qcom/msm8916-512mb-ion.dtsi b/arch/arm64/boot/dts/qcom/msm8916-512mb-ion.dtsi
index b688a10a6d8f..b988aed4bb26 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-512mb-ion.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-512mb-ion.dtsi
@@ -29,28 +29,28 @@
qcom,ion-heap@27 { /* QSEECOM HEAP */
compatible = "qcom,msm-ion-reserve";
reg = <27>;
- linux,contiguous-region = <&venus_qseecom_mem>;
+ memory-region = <&venus_qseecom_mem>;
qcom,ion-heap-type = "DMA";
};
qcom,ion-heap@28 { /* AUDIO HEAP */
compatible = "qcom,msm-ion-reserve";
reg = <28>;
- linux,contiguous-region = <&audio_mem>;
+ memory-region = <&audio_mem>;
qcom,ion-heap-type = "DMA";
};
qcom,ion-heap@23 { /* OTHER PIL HEAP */
compatible = "qcom,msm-ion-reserve";
reg = <23>;
- linux,contiguous-region = <&peripheral_mem>;
+ memory-region = <&peripheral_mem>;
qcom,ion-heap-type = "DMA";
};
qcom,ion-heap@26 { /* MODEM HEAP */
compatible = "qcom,msm-ion-reserve";
reg = <26>;
- linux,contiguous-region = <&modem_adsp_mem>;
+ memory-region = <&modem_adsp_mem>;
qcom,ion-heap-type = "DMA";
};
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-512mb-memory.dtsi b/arch/arm64/boot/dts/qcom/msm8916-512mb-memory.dtsi
index 8103c5707258..eb6b7006c3ac 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-512mb-memory.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-512mb-memory.dtsi
@@ -13,52 +13,46 @@
#include "msm8916-512mb-ion.dtsi"
/ {
- memory {
+ reserved-memory {
#address-cells = <2>;
#size-cells = <2>;
+ ranges;
- external_image_mem: external_image__region@0 {
- linux,reserve-contiguous-region;
- linux,reserve-region;
- linux,remove-completely;
+ external_image_mem: external_image_region@86000000 {
+ compatible = "removed-dma-pool";
+ no-map;
reg = <0x0 0x86000000 0x0 0x0800000>;
- label = "external_image_mem";
};
- modem_adsp_mem: modem_adsp_region@0 {
- linux,reserve-contiguous-region;
- linux,reserve-region;
- linux,remove-completely;
+ modem_adsp_mem: modem_adsp_region@86800000 {
+ compatible = "removed-dma-pool";
+ no-map;
reg = <0x0 0x86800000 0x0 0x04800000>;
- label = "modem_adsp_mem";
};
- peripheral_mem: pheripheral_region@0 {
- linux,reserve-contiguous-region;
- linux,reserve-region;
- linux,remove-completely;
+ peripheral_mem: peripheral_region@8b000000 {
+ compatible = "removed-dma-pool";
+ no-map;
reg = <0x0 0x8b000000 0x0 0x0600000>;
- label = "peripheral_mem";
};
venus_qseecom_mem: venus_qseecom_region@0 {
- linux,reserve-contiguous-region;
- linux,memory-limit = <0x90000000>;
- reg = <0 0 0 0x600000>;
- label = "venus_qseecom_mem";
+ compatible = "shared-dma-pool";
+ alloc-ranges = <0 0x80000000 0 0x10000000>;
+ reusable;
+ alignment = <0 0x400000>;
+ size = <0 0x600000>;
};
audio_mem: audio_region@0 {
- linux,reserve-contiguous-region;
- reg = <0 0 0 0x314000>;
- label = "audio_mem";
+ compatible = "shared-dma-pool";
+ reusable;
+ alignment = <0 0x400000>;
+ size = <0 0x400000>;
};
cont_splash_mem: splash_region@83000000 {
- linux,reserve-contiguous-region;
- linux,reserve-region;
reg = <0x0 0x83000000 0x0 0x1200000>;
- label = "cont_splash_mem";
};
};
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-ion.dtsi b/arch/arm64/boot/dts/qcom/msm8916-ion.dtsi
index 80baf241df41..687ab9201140 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-ion.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-ion.dtsi
@@ -29,36 +29,35 @@
qcom,ion-heap@8 { /* CP_MM HEAP */
compatible = "qcom,msm-ion-reserve";
reg = <8>;
- qcom,heap-align = <0x1000>;
- linux,contiguous-region = <&secure_mem>;
+ memory-region = <&secure_mem>;
qcom,ion-heap-type = "SECURE_DMA";
};
qcom,ion-heap@27 { /* QSEECOM HEAP */
compatible = "qcom,msm-ion-reserve";
reg = <27>;
- linux,contiguous-region = <&venus_qseecom_mem>;
+ memory-region = <&venus_qseecom_mem>;
qcom,ion-heap-type = "DMA";
};
qcom,ion-heap@28 { /* AUDIO HEAP */
compatible = "qcom,msm-ion-reserve";
reg = <28>;
- linux,contiguous-region = <&audio_mem>;
+ memory-region = <&audio_mem>;
qcom,ion-heap-type = "DMA";
};
qcom,ion-heap@23 { /* OTHER PIL HEAP */
compatible = "qcom,msm-ion-reserve";
reg = <23>;
- linux,contiguous-region = <&peripheral_mem>;
+ memory-region = <&peripheral_mem>;
qcom,ion-heap-type = "DMA";
};
qcom,ion-heap@26 { /* MODEM HEAP */
compatible = "qcom,msm-ion-reserve";
reg = <26>;
- linux,contiguous-region = <&modem_adsp_mem>;
+ memory-region = <&modem_adsp_mem>;
qcom,ion-heap-type = "DMA";
};
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-memory.dtsi b/arch/arm64/boot/dts/qcom/msm8916-memory.dtsi
index 9a7ddcf73314..4d48bed71899 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-memory.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-memory.dtsi
@@ -13,58 +13,53 @@
#include "msm8916-ion.dtsi"
/ {
- memory {
+ reserved-memory {
#address-cells = <2>;
#size-cells = <2>;
+ ranges;
- external_image_mem: external_image__region@0 {
- linux,reserve-contiguous-region;
- linux,reserve-region;
- linux,remove-completely;
+ external_image_mem: external_image_region@86000000 {
+ compatible = "removed-dma-pool";
+ no-map;
reg = <0x0 0x86000000 0x0 0x0800000>;
- label = "external_image_mem";
};
- modem_adsp_mem: modem_adsp_region@0 {
- linux,reserve-contiguous-region;
- linux,reserve-region;
- linux,remove-completely;
+ modem_adsp_mem: modem_adsp_region@86800000 {
+ compatible = "removed-dma-pool";
+ no-map;
reg = <0x0 0x86800000 0x0 0x04e00000>;
- label = "modem_adsp_mem";
};
- peripheral_mem: pheripheral_region@0 {
- linux,reserve-contiguous-region;
- linux,reserve-region;
- linux,remove-completely;
+ peripheral_mem: peripheral_region@8b600000 {
+ compatible = "removed-dma-pool";
+ no-map;
reg = <0x0 0x8b600000 0x0 0x0600000>;
- label = "peripheral_mem";
};
- secure_mem: secure_region@0 {
- linux,reserve-contiguous-region;
- reg = <0 0 0 0x6D00000>;
- label = "secure_mem";
+ secure_mem: secure_region {
+ compatible = "shared-dma-pool";
+ reusable;
+ alignment = <0 0x400000>;
+ size = <0 0x7000000>;
};
- venus_qseecom_mem: venus_qseecom_region@0 {
- linux,reserve-contiguous-region;
- linux,memory-limit = <0x90000000>;
- reg = <0 0 0 0x1200000>;
- label = "venus_qseecom_mem";
+ venus_qseecom_mem: venus_qseecom_region {
+ compatible = "shared-dma-pool";
+ alloc-ranges = <0 0x80000000 0 0x10000000>;
+ reusable;
+ alignment = <0 0x400000>;
+ size = <0 0x1400000>;
};
- audio_mem: audio_region@0 {
- linux,reserve-contiguous-region;
- reg = <0 0 0 0x314000>;
- label = "audio_mem";
+ audio_mem: audio_region {
+ compatible = "shared-dma-pool";
+ reusable;
+ alignment = <0 0x400000>;
+ size = <0 0x400000>;
};
cont_splash_mem: splash_region@83000000 {
- linux,reserve-contiguous-region;
- linux,reserve-region;
reg = <0x0 0x83000000 0x0 0x1200000>;
- label = "cont_splash_mem";
};
};
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index c4cccc8509c4..ca18eddefe27 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -1508,7 +1508,7 @@
qcom,pas-id = <9>;
qcom,proxy-timeout-ms = <5000>;
qcom,firmware-name = "venus";
- linux,contiguous-region = <&venus_qseecom_mem>;
+ memory-region = <&venus_qseecom_mem>;
};
qcom,msm-thermal {
@@ -1600,7 +1600,7 @@
/* GPIO output to mss */
qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_1_out 0 0>;
- linux,contiguous-region = <&modem_adsp_mem>;
+ memory-region = <&modem_adsp_mem>;
};
qcom,vidc@1d00000 {
@@ -1707,7 +1707,7 @@
/* GPIO output to wcnss */
qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_4_out 0 0>;
- linux,contiguous-region = <&peripheral_mem>;
+ memory-region = <&peripheral_mem>;
};
cpu-pmu {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 04:54:26 +0000