Commit 59046d15 authored by Cristian Marussi's avatar Cristian Marussi Committed by Sudeep Holla
Browse files

regulator: scmi: Port driver to the new scmi_voltage_proto_ops interface 

Port the scmi regulator driver to the new SCMI voltage interface based
on protocol handles and common devm_get_ops().

Link: https://lore.kernel.org/r/20210316124903.35011-30-cristian.marussi@arm.com


Cc: Mark Brown <broonie@kernel.org>
Tested-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarCristian Marussi <cristian.marussi@arm.com>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent fe4894d9

drivers/regulator/scmi-regulator.c

+23 −19
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
//

// System Control and Management Interface (SCMI) based regulator driver

//

// Copyright (C) 2020 ARM Ltd.

// Copyright (C) 2020-2021 ARM Ltd.

//

// Implements a regulator driver on top of the SCMI Voltage Protocol.

//
@@ -33,9 +33,12 @@ 
#include <linux/slab.h>

#include <linux/types.h>



static const struct scmi_voltage_proto_ops *voltage_ops;



struct scmi_regulator {

	u32 id;

	struct scmi_device *sdev;

	struct scmi_protocol_handle *ph;

	struct regulator_dev *rdev;

	struct device_node *of_node;

	struct regulator_desc desc;
@@ -50,18 +53,16 @@ struct scmi_regulator_info { 
static int scmi_reg_enable(struct regulator_dev *rdev)

{

	struct scmi_regulator *sreg = rdev_get_drvdata(rdev);

	const struct scmi_handle *handle = sreg->sdev->handle;



	return handle->voltage_ops->config_set(handle, sreg->id,

	return voltage_ops->config_set(sreg->ph, sreg->id,

				       SCMI_VOLTAGE_ARCH_STATE_ON);

}



static int scmi_reg_disable(struct regulator_dev *rdev)

{

	struct scmi_regulator *sreg = rdev_get_drvdata(rdev);

	const struct scmi_handle *handle = sreg->sdev->handle;



	return handle->voltage_ops->config_set(handle, sreg->id,

	return voltage_ops->config_set(sreg->ph, sreg->id,

				       SCMI_VOLTAGE_ARCH_STATE_OFF);

}
@@ -70,10 +71,8 @@ static int scmi_reg_is_enabled(struct regulator_dev *rdev) 
	int ret;

	u32 config;

	struct scmi_regulator *sreg = rdev_get_drvdata(rdev);

	const struct scmi_handle *handle = sreg->sdev->handle;



	ret = handle->voltage_ops->config_get(handle, sreg->id,

					      &config);

	ret = voltage_ops->config_get(sreg->ph, sreg->id, &config);

	if (ret) {

		dev_err(&sreg->sdev->dev,

			"Error %d reading regulator %s status.\n",
@@ -89,9 +88,8 @@ static int scmi_reg_get_voltage_sel(struct regulator_dev *rdev) 
	int ret;

	s32 volt_uV;

	struct scmi_regulator *sreg = rdev_get_drvdata(rdev);

	const struct scmi_handle *handle = sreg->sdev->handle;



	ret = handle->voltage_ops->level_get(handle, sreg->id, &volt_uV);

	ret = voltage_ops->level_get(sreg->ph, sreg->id, &volt_uV);

	if (ret)

		return ret;
@@ -103,13 +101,12 @@ static int scmi_reg_set_voltage_sel(struct regulator_dev *rdev, 
{

	s32 volt_uV;

	struct scmi_regulator *sreg = rdev_get_drvdata(rdev);

	const struct scmi_handle *handle = sreg->sdev->handle;



	volt_uV = sreg->desc.ops->list_voltage(rdev, selector);

	if (volt_uV <= 0)

		return -EINVAL;



	return handle->voltage_ops->level_set(handle, sreg->id, 0x0, volt_uV);

	return voltage_ops->level_set(sreg->ph, sreg->id, 0x0, volt_uV);

}



static const struct regulator_ops scmi_reg_fixed_ops = {
@@ -204,11 +201,10 @@ scmi_config_discrete_regulator_mappings(struct scmi_regulator *sreg, 
static int scmi_regulator_common_init(struct scmi_regulator *sreg)

{

	int ret;

	const struct scmi_handle *handle = sreg->sdev->handle;

	struct device *dev = &sreg->sdev->dev;

	const struct scmi_voltage_info *vinfo;



	vinfo = handle->voltage_ops->info_get(handle, sreg->id);

	vinfo = voltage_ops->info_get(sreg->ph, sreg->id);

	if (!vinfo) {

		dev_warn(dev, "Failure to get voltage domain %d\n",

			 sreg->id);
@@ -257,6 +253,7 @@ static int scmi_regulator_common_init(struct scmi_regulator *sreg) 
}



static int process_scmi_regulator_of_node(struct scmi_device *sdev,

					  struct scmi_protocol_handle *ph,

					  struct device_node *np,

					  struct scmi_regulator_info *rinfo)

{
@@ -284,6 +281,7 @@ static int process_scmi_regulator_of_node(struct scmi_device *sdev, 


	rinfo->sregv[dom]->id = dom;

	rinfo->sregv[dom]->sdev = sdev;

	rinfo->sregv[dom]->ph = ph;



	/* get hold of good nodes */

	of_node_get(np);
@@ -302,11 +300,17 @@ static int scmi_regulator_probe(struct scmi_device *sdev) 
	struct device_node *np, *child;

	const struct scmi_handle *handle = sdev->handle;

	struct scmi_regulator_info *rinfo;

	struct scmi_protocol_handle *ph;



	if (!handle || !handle->voltage_ops)

	if (!handle)

		return -ENODEV;



	num_doms = handle->voltage_ops->num_domains_get(handle);

	voltage_ops = handle->devm_protocol_get(sdev,

						SCMI_PROTOCOL_VOLTAGE, &ph);

	if (IS_ERR(voltage_ops))

		return PTR_ERR(voltage_ops);



	num_doms = voltage_ops->num_domains_get(ph);

	if (num_doms <= 0) {

		if (!num_doms) {

			dev_err(&sdev->dev,
@@ -341,7 +345,7 @@ static int scmi_regulator_probe(struct scmi_device *sdev) 
	 */

	np = of_find_node_by_name(handle->dev->of_node, "regulators");

	for_each_child_of_node(np, child) {

		ret = process_scmi_regulator_of_node(sdev, child, rinfo);

		ret = process_scmi_regulator_of_node(sdev, ph, child, rinfo);

		/* abort on any mem issue */

		if (ret == -ENOMEM)

			return ret;