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

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

Merge "msm: spm: Update the vctl, phase and pfm port values for cpu devices"

parents c45b600b 2a5e932c

Documentation/devicetree/bindings/arm/msm/spm-v2.txt

+3 −3
Original line number Diff line number Diff line
@@ -33,10 +33,10 @@ Optional properties 
	between AVS controller requests

- qcom,saw2-pmic-data0..7: Specify the pmic data value and the associated FTS

	index to send the PMIC data to

- qcom,saw2-vctl-port: The PVC (PMIC Virtual Channel) port used for changing

- qcom,vctl-port: The PVC (PMIC Virtual Channel) port used for changing

	voltage

- qcom,saw2-phase-port: The PVC port used for changing the number of phases

- qcom,saw2-pfm-port: The PVC port used for enabling PWM/PFM modes

- qcom,phase-port: The PVC port used for changing the number of phases

- qcom,pfm-port: The PVC port used for enabling PWM/PFM modes

- qcom,saw2-spm-cmd-wfi: The WFI command sequence

- qcom,saw2-spm-cmd-ret: The Retention command sequence

- qcom,saw2-spm-cmd-spc: The Standalone PC command sequence

arch/arm/mach-msm/spm_devices.c

+8 −14
Original line number Diff line number Diff line
@@ -455,23 +455,17 @@ static int msm_spm_dev_probe(struct platform_device *pdev) 
	spm_data.phase_port = -1;

	spm_data.pfm_port = -1;



	/* optional */

	if (dev == &msm_spm_l2_device) {

	key = "qcom,vctl-port";

		ret = of_property_read_u32(node, key, &val);

		if (!ret)

			spm_data.vctl_port = val;

	of_property_read_u32(node, key, &spm_data.vctl_port);



	key = "qcom,phase-port";

		ret = of_property_read_u32(node, key, &val);

		if (!ret)

			spm_data.phase_port = val;

	of_property_read_u32(node, key, &spm_data.phase_port);



	key = "qcom,pfm-port";

		ret = of_property_read_u32(node, key, &val);

		if (!ret)

			spm_data.pfm_port = val;

	of_property_read_u32(node, key, &spm_data.pfm_port);



	/* optional */

	if (dev == &msm_spm_l2_device) {

		key = "qcom,L2-spm-is-apcs-master";

		msm_spm_L2_apcs_master =

			of_property_read_bool(pdev->dev.of_node, key);