diff --git a/Documentation/devicetree/bindings/memory.txt b/Documentation/devicetree/bindings/memory.txt
index 3ee245ee8efa2e3d136df1ca1679592c905671c3..699177d3171042617f57b67e1a4327aec69d65df 100644
--- a/Documentation/devicetree/bindings/memory.txt
+++ b/Documentation/devicetree/bindings/memory.txt
@@ -34,7 +34,7 @@ wit the following convention:
(name): region@(base-address) {
reg = <(baseaddr) (size)>;
- (linux,contiguous-region);
+ (linux,reserve-contiguous-region);
(linux,default-contiguous-region);
(linux,reserve-region);
(linux,memory-limit);
@@ -44,7 +44,7 @@ wit the following convention:
name: an name given to the defined region.
base-address: the base address of the defined region.
size: the size of the memory region.
-linux,contiguous-region: property indicating that the defined memory
+linux,reserve-contiguous-region: property indicating that the defined memory
region is used for contiguous memory allocations,
Linux specific (optional)
linux,default-contiguous-region: property indicating that the region
@@ -98,13 +98,13 @@ logo appears.
0x70000000 0x10000000>;
contig_mem: region@72000000 {
- linux,contiguous-region;
+ linux,reserve-contiguous-region;
linux,default-contiguous-region;
reg = <0x72000000 0x4000000>;
};
display_mem: region@78000000 {
- linux,contiguous-region;
+ linux,reserve-contiguous-region;
reg = <0x78000000 0x1000000>;
};
};
diff --git a/arch/arm/boot/dts/qcom/apq8084.dtsi b/arch/arm/boot/dts/qcom/apq8084.dtsi
index dabdb3a4eb615b8a0111474f91fa3795e49a10ba..197a46c310e929c2d9fc6c2aab94cf299abd996a 100644
--- a/arch/arm/boot/dts/qcom/apq8084.dtsi
+++ b/arch/arm/boot/dts/qcom/apq8084.dtsi
@@ -31,20 +31,20 @@
#size-cells = <2>;
qsecom_mem: qsecom_region@0 {
- linux,contiguous-region;
+ linux,reserve-contiguous-region;
reg = <0 0 0 0x1100000>;
label = "qseecom_mem";
};
fb_mem: fb_region@0 {
- linux,contiguous-region;
+ linux,reserve-contiguous-region;
reg = <0 0 0 0x1000000>;
label = "fb_mem";
linux,memory-limit = <0xffffffff>;
};
secure_mem: secure_region@0 {
- linux,contiguous-region;
+ linux,reserve-contiguous-region;
reg = <0 0 0 0xfc00000>;
label = "secure_mem";
};
diff --git a/arch/arm/boot/dts/qcom/mdm9630.dtsi b/arch/arm/boot/dts/qcom/mdm9630.dtsi
index 23bf9878c2eac90ed28ed818d20c177f6225b247..0ffd3e101f3f08c8d9d17d1fa9bff0d13c02ab3a 100644
--- a/arch/arm/boot/dts/qcom/mdm9630.dtsi
+++ b/arch/arm/boot/dts/qcom/mdm9630.dtsi
@@ -26,7 +26,7 @@
memory {
audio_mem: audio_region@0 {
- linux,contiguous-region;
+ linux,reserve-contiguous-region;
linux,reserve-region;
reg = <0 0xAF000>;
label = "audio_mem";
diff --git a/arch/arm/boot/dts/qcom/mpq8092.dtsi b/arch/arm/boot/dts/qcom/mpq8092.dtsi
index 1c3ef7bad7494ac1069c06351b217cff70a79f4b..b69b393cf3686423782befda840a62150881e770 100644
--- a/arch/arm/boot/dts/qcom/mpq8092.dtsi
+++ b/arch/arm/boot/dts/qcom/mpq8092.dtsi
@@ -31,20 +31,20 @@
memory {
audio_mem: audio_region@0 {
- linux,contiguous-region;
+ linux,reserve-contiguous-region;
linux,reserve-region;
reg = <0 0x614000>;
label = "audio_mem";
};
qseecom_mem: qseecom_region@0 {
- linux,contiguous-region;
+ linux,reserve-contiguous-region;
reg = <0 0x1100000>;
label = "qseecom_mem";
};
secure_mem: secure_region@0 {
- linux,contiguous-region;
+ linux,reserve-contiguous-region;
reg = <0 0xfc00000>;
label = "secure_mem";
};
diff --git a/arch/arm/boot/dts/qcom/msm8226.dtsi b/arch/arm/boot/dts/qcom/msm8226.dtsi
index 971a960be3d561a94d188d01b1526065a524ee46..82c5de187e5a8bcdee79dc3b8645ca3cc6fa6a57 100644
--- a/arch/arm/boot/dts/qcom/msm8226.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8226.dtsi
@@ -26,31 +26,31 @@
memory {
secure_mem: secure_region@0 {
- linux,contiguous-region;
+ linux,reserve-contiguous-region;
reg = <0 0x6D00000>;
label = "secure_mem";
};
adsp_mem: adsp_region@0 {
- linux,contiguous-region;
+ linux,reserve-contiguous-region;
reg = <0 0x2a00000>;
label = "adsp_mem";
};
qsecom_mem: qsecom_region@0 {
- linux,contiguous-region;
+ linux,reserve-contiguous-region;
reg = <0 0xd00000>;
label = "qsecom_mem";
};
fb_mem: fb_region@0 {
- linux,contiguous-region;
+ linux,reserve-contiguous-region;
reg = <0 0x800000>;
label = "fb_mem";
};
audio_mem: audio_region@0 {
- linux,contiguous-region;
+ linux,reserve-contiguous-region;
linux,reserve-region;
reg = <0 0x314000>;
label = "audio_mem";
diff --git a/arch/arm/boot/dts/qcom/msm8610.dtsi b/arch/arm/boot/dts/qcom/msm8610.dtsi
index e48188bd0d091f729c13fb567708b82457457252..3750b8d69749092803914acb4caf4f7ccf26cbf8 100644
--- a/arch/arm/boot/dts/qcom/msm8610.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8610.dtsi
@@ -27,7 +27,7 @@
memory {
qsecom_mem: qsecom_region@0 {
- linux,contiguous-region;
+ linux,reserve-contiguous-region;
reg = <0 0x100000>;
label = "qsecom_mem";
};
diff --git a/arch/arm/boot/dts/qcom/msm8974.dtsi b/arch/arm/boot/dts/qcom/msm8974.dtsi
index 3b9d3d84b3679a64712e85c37ab8620b70ccc125..7e416745e71c5a4eee08fdf5e779c94594341e6e 100644
--- a/arch/arm/boot/dts/qcom/msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8974.dtsi
@@ -71,31 +71,31 @@
memory {
secure_mem: secure_region@0 {
- linux,contiguous-region;
+ linux,reserve-contiguous-region;
reg = <0 0xFC00000>;
label = "secure_mem";
};
adsp_mem: adsp_region@0 {
- linux,contiguous-region;
+ linux,reserve-contiguous-region;
reg = <0 0x3F00000>;
label = "adsp_mem";
};
qsecom_mem: qsecom_region@0 {
- linux,contiguous-region;
+ linux,reserve-contiguous-region;
reg = <0 0x1100000>;
label = "qseecom_mem";
};
fb_mem: fb_region@0 {
- linux,contiguous-region;
+ linux,reserve-contiguous-region;
reg = <0 0x800000>;
label = "fb_mem";
};
audio_mem: audio_region@0 {
- linux,contiguous-region;
+ linux,reserve-contiguous-region;
linux,reserve-region;
reg = <0 0x614000>;
lable = "audio_mem";
diff --git a/arch/arm/boot/dts/qcom/msmsamarium.dtsi b/arch/arm/boot/dts/qcom/msmsamarium.dtsi
index 0f706b33f535adb02eb3a758ba02f9263509202a..51ea3abd7c13b4cb2b670b4e81d311bd927a79cf 100644
--- a/arch/arm/boot/dts/qcom/msmsamarium.dtsi
+++ b/arch/arm/boot/dts/qcom/msmsamarium.dtsi
@@ -27,7 +27,7 @@
memory {
fb_mem: fb_region@0 {
- linux,contiguous-region;
+ linux,reserve-contiguous-region;
reg = <0 0x1400000>;
label = "fb_mem";
};
diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c
index 0321a12d6fc55c1a9378760b72c7d914d2f774e4..1eeb5ce1b14b871e5c4e1d4c4e64bedc81ed1c15 100644
--- a/drivers/base/dma-contiguous.c
+++ b/drivers/base/dma-contiguous.c
@@ -224,7 +224,7 @@ int __init cma_fdt_scan(unsigned long node, const char *uname,
unsigned long addr_cells = dt_root_addr_cells;
phys_addr_t limit = MEMBLOCK_ALLOC_ANYWHERE;
- if (!of_get_flat_dt_prop(node, "linux,contiguous-region", NULL))
+ if (!of_get_flat_dt_prop(node, "linux,reserve-contiguous-region", NULL))
return 0;
prop = of_get_flat_dt_prop(node, "#size-cells", NULL);