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

Commit 3680a4a9 authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Andy Gross
Browse files

soc: qcom: Update properties for smem state referencing 



Update the property names to match device tree bindings, the correct
values should be qcom,smem-states and qcom,smem-state-names.

Also update the #qcom,smem-state-cells for consistency, before we merge
any users of these properties.

Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Acked-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarAndy Gross <andy.gross@linaro.org>
parent e7306dd7

Documentation/devicetree/bindings/soc/qcom/qcom,smp2p.txt

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ important. 
	Value type: <u32>

	Definition: must be 2 - denoting the bit in the entry and IRQ flags



- #qcom,state-cells:

- #qcom,smem-state-cells:

	Usage: required for outgoing entries

	Value type: <u32>

	Definition: must be 1 - denoting the bit in the entry
@@ -92,7 +92,7 @@ wcnss-smp2p { 
	wcnss_smp2p_out: master-kernel {

		qcom,entry-name = "master-kernel";



		#qcom,state-cells = <1>;

		#qcom,smem-state-cells = <1>;

	};



	wcnss_smp2p_in: slave-kernel {

Documentation/devicetree/bindings/soc/qcom/qcom,smsm.txt

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ important. 
	Definition: specifies the offset, in words, of the first bit for this

		    entry



- #qcom,state-cells:

- #qcom,smem-state-cells:

	Usage: required for local entry

	Value type: <u32>

	Definition: must be 1 - denotes bit number
@@ -91,7 +91,7 @@ smsm { 
	apps_smsm: apps@0 {

		reg = <0>;



		#qcom,state-cells = <1>;

		#qcom,smem-state-cells = <1>;

	};



	wcnss_smsm: wcnss@7 {

drivers/soc/qcom/smem_state.c

+6 −6
Original line number Diff line number Diff line
@@ -104,26 +104,26 @@ struct qcom_smem_state *qcom_smem_state_get(struct device *dev, 


	if (con_id) {

		index = of_property_match_string(dev->of_node,

						 "qcom,state-names",

						 "qcom,smem-state-names",

						 con_id);

		if (index < 0) {

			dev_err(dev, "missing qcom,state-names\n");

			dev_err(dev, "missing qcom,smem-state-names\n");

			return ERR_PTR(index);

		}

	}



	ret = of_parse_phandle_with_args(dev->of_node,

					 "qcom,state",

					 "#qcom,state-cells",

					 "qcom,smem-states",

					 "#qcom,smem-state-cells",

					 index,

					 &args);

	if (ret) {

		dev_err(dev, "failed to parse qcom,state property\n");

		dev_err(dev, "failed to parse qcom,smem-states property\n");

		return ERR_PTR(ret);

	}



	if (args.args_count != 1) {

		dev_err(dev, "invalid #qcom,state-cells\n");

		dev_err(dev, "invalid #qcom,smem-state-cells\n");

		return ERR_PTR(-EINVAL);

	}

drivers/soc/qcom/smsm.c

+1 −1
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ static int qcom_smsm_probe(struct platform_device *pdev) 
	if (!smsm->hosts)

		return -ENOMEM;



	local_node = of_find_node_with_property(pdev->dev.of_node, "#qcom,state-cells");

	local_node = of_find_node_with_property(pdev->dev.of_node, "#qcom,smem-state-cells");

	if (!local_node) {

		dev_err(&pdev->dev, "no state entry\n");

		return -EINVAL;