Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit d4632cca authored Dec 17, 2013 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Dec 17, 2013

Merge "ARM: dts: Add @address property for CMA nodes"

parents 71df1369 bc46da38

arch/arm/boot/dts/qti/apq8084-liquid.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@
		};

		memory {
		fb_mem: fb_region {
		fb_mem: fb_region@0 {
		reg = <0 0 0 0x1d00000>;
		};
		};

arch/arm/boot/dts/qti/apq8084.dtsi

+3 −3

Original line number	Diff line number	Diff line
		@@ -30,20 +30,20 @@
		#address-cells = <2>;
		#size-cells = <2>;

		qsecom_mem: qsecom_region {
		qsecom_mem: qsecom_region@0 {
		linux,contiguous-region;
		reg = <0 0 0 0x1100000>;
		label = "qseecom_mem";
		};

		fb_mem: fb_region {
		fb_mem: fb_region@0 {
		linux,contiguous-region;
		reg = <0 0 0 0x1000000>;
		label = "fb_mem";
		linux,memory-limit = <0xffffffff>;
		};

		secure_mem: secure_region {
		secure_mem: secure_region@0 {
		linux,contiguous-region;
		reg = <0 0 0 0xfc00000>;
		label = "secure_mem";

arch/arm/boot/dts/qti/msm8226.dtsi

+5 −5

Original line number	Diff line number	Diff line
		@@ -25,31 +25,31 @@
		};

		memory {
		secure_mem: secure_region {
		secure_mem: secure_region@0 {
		linux,contiguous-region;
		reg = <0 0x6D00000>;
		label = "secure_mem";
		};

		adsp_mem: adsp_region {
		adsp_mem: adsp_region@0 {
		linux,contiguous-region;
		reg = <0 0x2a00000>;
		label = "adsp_mem";
		};

		qsecom_mem: qsecom_region {
		qsecom_mem: qsecom_region@0 {
		linux,contiguous-region;
		reg = <0 0xd00000>;
		label = "qsecom_mem";
		};

		fb_mem: fb_region {
		fb_mem: fb_region@0 {
		linux,contiguous-region;
		reg = <0 0x800000>;
		label = "fb_mem";
		};

		audio_mem: audio_region {
		audio_mem: audio_region@0 {
		linux,contiguous-region;
		linux,reserve-region;
		reg = <0 0x314000>;

arch/arm/boot/dts/qti/msm8610.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@
		interrupt-parent = <&intc>;

		memory {
		qsecom_mem: qsecom_region {
		qsecom_mem: qsecom_region@0 {
		linux,contiguous-region;
		reg = <0 0x100000>;
		label = "qsecom_mem";

arch/arm/boot/dts/qti/msm8974-liquid.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@

		memory {

		fb_mem: fb_region {
		fb_mem: fb_region@0 {
		reg = <0 0x1000000>;
		};
		};