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

Commit 00aba4e6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add reservation for framebuffer memory"

parents ab864fa4 c9853397

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

+6 −0
Original line number Diff line number Diff line
@@ -15,6 +15,12 @@ 
		serial0 = &blsp2_uart1;

	};



	memory {

		fb_mem: fb_region {

			reg = <0 0 0 0x1d00000>;

		};

	};



	bt_qca6174 {

		compatible = "qca,qca6174";

		qca,bt-reset-gpio = <&pma8084_gpios 4 0>; /* BT_EN */

arch/arm/boot/dts/apq8084.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -35,6 +35,13 @@ 
			reg = <0 0 0 0x1100000>;

			label = "qseecom_mem";

                };



		fb_mem: fb_region {

			linux,contiguous-region;

			reg = <0 0 0 0x1000000>;

			label = "fb_mem";

			linux,memory-limit = <0xffffffff>;

		};

        };

};

arch/arm/boot/dts/msm8226.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -42,6 +42,13 @@ 
			reg = <0 0x780000>;

			label = "qsecom_mem";

		};



		fb_mem: fb_region {

			linux,contiguous-region;

			reg = <0 0x800000>;

			label = "fb_mem";

		};



	};



	soc: soc { };

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

+7 −0
Original line number Diff line number Diff line
@@ -17,6 +17,13 @@ 
	aliases {

		serial0 = &blsp1_uart1;

	};



	memory {



		fb_mem: fb_region {

			reg = <0 0x1000000>;

		};

	};

};



&soc {

arch/arm/boot/dts/msm8974.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -87,6 +87,12 @@ 
			label = "qseecom_mem";

		};



		fb_mem: fb_region {

			linux,contiguous-region;

			reg = <0 0x800000>;

			label = "fb_mem";

		};



	};



	soc: soc { };