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

Commit ae7cd896 authored by David Collins's avatar David Collins Committed by Matt Wagantall
Browse files

regulator: rpm-smd-regulator: add support for enable via pin control 



Add support for sending dynamic requests for the enable pin
control parameter 'pcen' via regulator_enable() and
regulator_disable() calls.  This is managed via a new device tree
property which specifies the 'pcen' value to send for both the
disabled and enabled logical states.

Change-Id: I80744f112298f6de3761ac1868a0589686f633a2
Signed-off-by: default avatarDavid Collins <collinsd@codeaurora.org>
parent 43d3505b

Documentation/devicetree/bindings/regulator/rpm-smd-regulator.txt

+36 −1
Original line number Diff line number Diff line
@@ -94,6 +94,15 @@ Optional properties: 
				this flag is not specified, then initial

				parameters values will only be sent after some

				consumer makes a request.

- qcom,enable-with-pin-ctrl:   Double in which the first element corresponds to

				the pin control enable parameter value to send

				when all consumers have requested the regulator

				to be disabled.  The second element corresponds

				to the pin control enable parameter value to

				send when any consumer has requested the

				regulator to be enabled.  Each element supports

				the same set of values as the

				qcom,init-pin-ctrl-enable property listed below.



The following properties specify initial values for parameters to be sent to the

RPM in regulator requests.
@@ -191,7 +200,7 @@ All properties specified within the core regulator framework can also be used in 
second level nodes.  These bindings can be found in:

Documentation/devicetree/bindings/regulator/regulator.txt.



Example:

Examples:



rpm-regulator-smpb1 {

	qcom,resource-name = "smpb";
@@ -226,3 +235,29 @@ rpm-regulator-smpb1 { 
		compatible = "qcom,rpm-smd-regulator";

	};

};



rpm-regulator-ldoa2 {

	qcom,resource-name = "ldoa";

	qcom,resource-id = <2>;

	qcom,regulator-type = <0>;

	qcom,hpm-min-load = <10000>;

	compatible = "qcom,rpm-smd-regulator-resource";



	regulator-l2 {

		compatible = "qcom,rpm-smd-regulator";

		regulator-name = "8941_l2";

		qcom,set = <3>;

		regulator-min-microvolt = <1225000>;

		regulator-max-microvolt = <1225000>;

		qcom,init-voltage = <1225000>;

	};

	regulator-l2-pin-ctrl {

		compatible = "qcom,rpm-smd-regulator";

		regulator-name = "8941_l2_pin_ctrl";

		qcom,set = <3>;

		regulator-min-microvolt = <1225000>;

		regulator-max-microvolt = <1225000>;

		qcom,init-voltage = <1225000>;

		qcom,enable-with-pin-ctrl = <0 1>;

	};

};

drivers/regulator/rpm-smd-regulator.c

+100 −13
Original line number Diff line number Diff line
@@ -142,6 +142,11 @@ static struct rpm_regulator_mode_map mode_mapping[] = { 
		= {RPM_REGULATOR_LDO_MODE_HPM,   RPM_REGULATOR_SMPS_MODE_PWM},

};



/* Indices for use with pin control enable via enable/disable feature. */

#define RPM_VREG_PIN_CTRL_STATE_DISABLE	0

#define RPM_VREG_PIN_CTRL_STATE_ENABLE	1

#define RPM_VREG_PIN_CTRL_STATE_COUNT	2



struct rpm_vreg_request {

	u32			param[RPM_REGULATOR_PARAM_MAX];

	u32			valid;
@@ -176,10 +181,12 @@ struct rpm_regulator { 
	bool			set_sleep;

	bool			always_send_voltage;

	bool			always_send_current;

	bool			use_pin_ctrl_for_enable;

	struct rpm_vreg_request	req;

	int			system_load;

	int			min_uV;

	int			max_uV;

	u32			pin_ctrl_mask[RPM_VREG_PIN_CTRL_STATE_COUNT];

};



/*
@@ -609,7 +616,11 @@ static int rpm_vreg_is_enabled(struct regulator_dev *rdev) 
{

	struct rpm_regulator *reg = rdev_get_drvdata(rdev);



	if (likely(!reg->use_pin_ctrl_for_enable))

		return reg->req.param[RPM_REGULATOR_PARAM_ENABLE];

	else

		return reg->req.param[RPM_REGULATOR_PARAM_PIN_CTRL_ENABLE]

			== reg->pin_ctrl_mask[RPM_VREG_PIN_CTRL_STATE_ENABLE];

}



static int rpm_vreg_enable(struct regulator_dev *rdev)
@@ -620,6 +631,8 @@ static int rpm_vreg_enable(struct regulator_dev *rdev) 


	rpm_vreg_lock(reg->rpm_vreg);



	if (likely(!reg->use_pin_ctrl_for_enable)) {

		/* Enable using swen KVP. */

		prev_enable = reg->req.param[RPM_REGULATOR_PARAM_ENABLE];

		RPM_VREG_SET_PARAM(reg, ENABLE, 1);

		rc = rpm_vreg_aggregate_requests(reg);
@@ -627,6 +640,18 @@ static int rpm_vreg_enable(struct regulator_dev *rdev) 
			vreg_err(reg, "enable failed, rc=%d", rc);

			RPM_VREG_SET_PARAM(reg, ENABLE, prev_enable);

		}

	} else {

		/* Enable using pcen KVP. */

		prev_enable

			= reg->req.param[RPM_REGULATOR_PARAM_PIN_CTRL_ENABLE];

		RPM_VREG_SET_PARAM(reg, PIN_CTRL_ENABLE,

			reg->pin_ctrl_mask[RPM_VREG_PIN_CTRL_STATE_ENABLE]);

		rc = rpm_vreg_aggregate_requests(reg);

		if (rc) {

			vreg_err(reg, "enable failed, rc=%d", rc);

			RPM_VREG_SET_PARAM(reg, PIN_CTRL_ENABLE, prev_enable);

		}

	}



	rpm_vreg_unlock(reg->rpm_vreg);
@@ -641,13 +666,27 @@ static int rpm_vreg_disable(struct regulator_dev *rdev) 


	rpm_vreg_lock(reg->rpm_vreg);



	if (likely(!reg->use_pin_ctrl_for_enable)) {

		/* Disable using swen KVP. */

		prev_enable = reg->req.param[RPM_REGULATOR_PARAM_ENABLE];

		RPM_VREG_SET_PARAM(reg, ENABLE, 0);

		rc = rpm_vreg_aggregate_requests(reg);

		if (rc) {

		vreg_err(reg, "enable failed, rc=%d", rc);

			vreg_err(reg, "disable failed, rc=%d", rc);

			RPM_VREG_SET_PARAM(reg, ENABLE, prev_enable);

		}

	} else {

		/* Disable using pcen KVP. */

		prev_enable

			= reg->req.param[RPM_REGULATOR_PARAM_PIN_CTRL_ENABLE];

		RPM_VREG_SET_PARAM(reg, PIN_CTRL_ENABLE,

			reg->pin_ctrl_mask[RPM_VREG_PIN_CTRL_STATE_DISABLE]);

		rc = rpm_vreg_aggregate_requests(reg);

		if (rc) {

			vreg_err(reg, "disable failed, rc=%d", rc);

			RPM_VREG_SET_PARAM(reg, PIN_CTRL_ENABLE, prev_enable);

		}

	}



	rpm_vreg_unlock(reg->rpm_vreg);
@@ -906,6 +945,47 @@ static int rpm_vreg_send_defaults(struct rpm_regulator *reg) 
	return rc;

}



static int rpm_vreg_configure_pin_control_enable(struct rpm_regulator *reg,

		struct device_node *node)

{

	struct rpm_regulator_param *pcen_param =

			&params[RPM_REGULATOR_PARAM_PIN_CTRL_ENABLE];

	int rc, i;



	if (!of_find_property(node, "qcom,enable-with-pin-ctrl", NULL))

		return 0;



	if (pcen_param->supported_regulator_types

			& BIT(reg->rpm_vreg->regulator_type)) {

		rc = of_property_read_u32_array(node,

			"qcom,enable-with-pin-ctrl", reg->pin_ctrl_mask,

			RPM_VREG_PIN_CTRL_STATE_COUNT);

		if (rc) {

			vreg_err(reg, "could not read qcom,enable-with-pin-ctrl, rc=%d\n",

				rc);

			return rc;

		}



		/* Verify that the mask values are valid. */

		for (i = 0; i < RPM_VREG_PIN_CTRL_STATE_COUNT; i++) {

			if (reg->pin_ctrl_mask[i] < pcen_param->min

			    || reg->pin_ctrl_mask[i] > pcen_param->max) {

				vreg_err(reg, "device tree property: qcom,enable-with-pin-ctrl[%d]=%u is outside allowed range [%u, %u]\n",

					i, reg->pin_ctrl_mask[i],

					pcen_param->min, pcen_param->max);

				return -EINVAL;

			}

		}



		reg->use_pin_ctrl_for_enable = true;

	} else {

		pr_warn("%s: regulator type=%d does not support device tree property: qcom,enable-with-pin-ctrl\n",

			reg->rdesc.name, reg->rpm_vreg->regulator_type);

	}



	return 0;

}



/**

 * rpm_regulator_get() - lookup and obtain a handle to an RPM regulator

 * @dev: device for regulator consumer
@@ -1509,6 +1589,13 @@ static int rpm_vreg_device_probe(struct platform_device *pdev) 


	of_property_read_u32(node, "qcom,system-load", &reg->system_load);



	rc = rpm_vreg_configure_pin_control_enable(reg, node);

	if (rc) {

		vreg_err(reg, "could not configure pin control enable, rc=%d\n",

			rc);

		goto fail_free_reg;

	}



	rpm_vreg_lock(rpm_vreg);

	list_add(&reg->list, &rpm_vreg->reg_list);

	rpm_vreg_unlock(rpm_vreg);