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

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

Merge "memshare: Change the compatible property field for child node"

parents b67c33b9 94df3770

Documentation/devicetree/bindings/arm/msm/heap-sharing.txt

+2 −5
Original line number Diff line number Diff line
@@ -10,13 +10,10 @@ Required properties for Memshare 
-Root Node-



- compatible:	Must be "qcom,memshare"

- qcom,num-clients: Indicates the number of child nodes



All child nodes have different compatible stings.



Required properties for child nodes:



- compatible:	Must be "memshare,peripheral"

- compatible:	Must be "qcom,memshare-peripheral"



- qcom,peripheral-size: Indicates the size (in bytes) required for that child.
@@ -32,7 +29,7 @@ qcom,memshare { 
	compatible = "qcom,memshare";



	qcom,client_1 {

		compatible = "memshare,peripheral";

		compatible = "qcom,memshare-peripheral";

		qcom,peripheral-size = <2097152>;

		label = "modem";

	};

arch/arm/boot/dts/qcom/msm8909.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -1208,6 +1208,16 @@ 
		compatible = "qcom,msm-pcm-routing";

	};



	qcom,memshare {

		compatible = "qcom,memshare";



		qcom,client_1 {

			compatible = "qcom,memshare-peripheral";

			qcom,peripheral-size = <2097152>;

			label = "modem";

		};

	};



	pcm1: qcom,msm-pcm-low-latency {

		compatible = "qcom,msm-pcm-dsp";

		qcom,msm-pcm-dsp-id = <1>;

arch/arm/boot/dts/qcom/msm8916.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1596,7 +1596,7 @@ 
		compatible = "qcom,memshare";



		qcom,client_1 {

			compatible = "memshare,peripheral";

			compatible = "qcom,memshare-peripheral";

			qcom,peripheral-size = <2097152>;

			label = "modem";

		};

arch/arm/boot/dts/qcom/msm8939-common.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ 
		compatible = "qcom,memshare";



		qcom,client_1 {

			compatible = "memshare,peripheral";

			compatible = "qcom,memshare-peripheral";

			qcom,peripheral-size = <2097152>;

			label = "modem";

		};

drivers/soc/qcom/memshare/msm_memshare.c

+1 −1
Original line number Diff line number Diff line
@@ -730,7 +730,7 @@ static struct of_device_id memshare_match_table[] = { 


static struct of_device_id memshare_match_table1[] = {

	{

		.compatible = "memshare,peripheral",

		.compatible = "qcom,memshare-peripheral",

	},

	{}

};