Commit 2368f576 authored by Viresh Kumar's avatar Viresh Kumar
Browse files

OPP: Migrate set-clk-name API to use set-config helpers 



Now that we have a central API to handle all OPP table configurations,
migrate the set-clk-name family of helpers to use the new
infrastructure.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent 89f03984

drivers/opp/core.c

+43 −99
Original line number Diff line number Diff line
@@ -2164,104 +2164,71 @@ static void _opp_put_regulators(struct opp_table *opp_table) 
}



/**

 * dev_pm_opp_set_clkname() - Set clk name for the device

 * @dev: Device for which clk name is being set.

 * @name: Clk name.

 *

 * In order to support OPP switching, OPP layer needs to get pointer to the

 * clock for the device. Simple cases work fine without using this routine (i.e.

 * by passing connection-id as NULL), but for a device with multiple clocks

 * available, the OPP core needs to know the exact name of the clk to use.

 * _opp_set_clknames() - Set clk names for the device

 * @dev: Device for which clk names is being set.

 * @names: Clk names.

 *

 * In order to support OPP switching, OPP layer needs to get pointers to the

 * clocks for the device. Simple cases work fine without using this routine

 * (i.e. by passing connection-id as NULL), but for a device with multiple

 * clocks available, the OPP core needs to know the exact names of the clks to

 * use.

 *

 * This must be called before any OPPs are initialized for the device.

 */

struct opp_table *dev_pm_opp_set_clkname(struct device *dev, const char *name)

static int _opp_set_clknames(struct opp_table *opp_table, struct device *dev,

			     const char * const names[])

{

	struct opp_table *opp_table;

	int ret;

	const char * const *temp = names;

	int count = 0;



	opp_table = _add_opp_table(dev, false);

	if (IS_ERR(opp_table))

		return opp_table;

	/* Count number of clks */

	while (*temp++)

		count++;



	/* This should be called before OPPs are initialized */

	if (WARN_ON(!list_empty(&opp_table->opp_list))) {

		ret = -EBUSY;

		goto err;

	}

	/*

	 * This is a special case where we have a single clock, whose connection

	 * id name is NULL, i.e. first two entries are NULL in the array.

	 */

	if (!count && !names[1])

		count = 1;



	/* We support only one clock name for now */

	if (count != 1)

		return -EINVAL;



	/* Another CPU that shares the OPP table has set the clkname ? */

	if (opp_table->clk_configured)

		return opp_table;

		return 0;



	/* clk shouldn't be initialized at this point */

	if (WARN_ON(opp_table->clk)) {

		ret = -EBUSY;

		goto err;

	}

	if (WARN_ON(opp_table->clk))

		return -EBUSY;



	/* Find clk for the device */

	opp_table->clk = clk_get(dev, name);

	opp_table->clk = clk_get(dev, names[0]);

	if (IS_ERR(opp_table->clk)) {

		ret = dev_err_probe(dev, PTR_ERR(opp_table->clk),

		return dev_err_probe(dev, PTR_ERR(opp_table->clk),

				    "%s: Couldn't find clock\n", __func__);

		goto err;

	}



	opp_table->clk_configured = true;



	return opp_table;



err:

	dev_pm_opp_put_opp_table(opp_table);



	return ERR_PTR(ret);

	return 0;

}

EXPORT_SYMBOL_GPL(dev_pm_opp_set_clkname);



/**

 * dev_pm_opp_put_clkname() - Releases resources blocked for clk.

 * @opp_table: OPP table returned from dev_pm_opp_set_clkname().

 * _opp_put_clknames() - Releases resources blocked for clks.

 * @opp_table: OPP table returned from _opp_set_clknames().

 */

void dev_pm_opp_put_clkname(struct opp_table *opp_table)

static void _opp_put_clknames(struct opp_table *opp_table)

{

	if (unlikely(!opp_table))

		return;



	if (opp_table->clk_configured) {

		clk_put(opp_table->clk);

		opp_table->clk = ERR_PTR(-EINVAL);

		opp_table->clk_configured = false;



	dev_pm_opp_put_opp_table(opp_table);

}

EXPORT_SYMBOL_GPL(dev_pm_opp_put_clkname);



static void devm_pm_opp_clkname_release(void *data)

{

	dev_pm_opp_put_clkname(data);

	}



/**

 * devm_pm_opp_set_clkname() - Set clk name for the device

 * @dev: Device for which clk name is being set.

 * @name: Clk name.

 *

 * This is a resource-managed variant of dev_pm_opp_set_clkname().

 *

 * Return: 0 on success and errorno otherwise.

 */

int devm_pm_opp_set_clkname(struct device *dev, const char *name)

{

	struct opp_table *opp_table;



	opp_table = dev_pm_opp_set_clkname(dev, name);

	if (IS_ERR(opp_table))

		return PTR_ERR(opp_table);



	return devm_add_action_or_reset(dev, devm_pm_opp_clkname_release,

					opp_table);

}

EXPORT_SYMBOL_GPL(devm_pm_opp_set_clkname);



/**

 * dev_pm_opp_register_set_opp_helper() - Register custom set OPP helper
@@ -2544,7 +2511,7 @@ static void _opp_clear_config(struct opp_config_data *data) 
	if (data->flags & OPP_CONFIG_PROP_NAME)

		dev_pm_opp_put_prop_name(data->opp_table);

	if (data->flags & OPP_CONFIG_CLK)

		dev_pm_opp_put_clkname(data->opp_table);

		_opp_put_clknames(data->opp_table);



	dev_pm_opp_put_opp_table(data->opp_table);

	kfree(data);
@@ -2595,32 +2562,9 @@ int dev_pm_opp_set_config(struct device *dev, struct dev_pm_opp_config *config) 


	/* Configure clocks */

	if (config->clk_names) {

		const char * const *temp = config->clk_names;

		int count = 0;



		/* Count number of clks */

		while (*temp++)

			count++;



		/*

		 * This is a special case where we have a single clock, whose

		 * connection id name is NULL, i.e. first two entries are NULL

		 * in the array.

		 */

		if (!count && !config->clk_names[1])

			count = 1;



		/* We support only one clock name for now */

		if (count != 1) {

			ret = -EINVAL;

			goto err;

		}



		err = dev_pm_opp_set_clkname(dev, config->clk_names[0]);

		if (IS_ERR(err)) {

			ret = PTR_ERR(err);

		ret = _opp_set_clknames(opp_table, dev, config->clk_names);

		if (ret)

			goto err;

		}



		data->flags |= OPP_CONFIG_CLK;

	}

include/linux/pm_opp.h

+26 −15
Original line number Diff line number Diff line
@@ -186,9 +186,6 @@ void dev_pm_opp_clear_config(int token); 


struct opp_table *dev_pm_opp_set_prop_name(struct device *dev, const char *name);

void dev_pm_opp_put_prop_name(struct opp_table *opp_table);

struct opp_table *dev_pm_opp_set_clkname(struct device *dev, const char *name);

void dev_pm_opp_put_clkname(struct opp_table *opp_table);

int devm_pm_opp_set_clkname(struct device *dev, const char *name);

struct opp_table *dev_pm_opp_register_set_opp_helper(struct device *dev, int (*set_opp)(struct dev_pm_set_opp_data *data));

void dev_pm_opp_unregister_set_opp_helper(struct opp_table *opp_table);

int devm_pm_opp_register_set_opp_helper(struct device *dev, int (*set_opp)(struct dev_pm_set_opp_data *data));
@@ -387,18 +384,6 @@ static inline struct opp_table *dev_pm_opp_set_prop_name(struct device *dev, con 


static inline void dev_pm_opp_put_prop_name(struct opp_table *opp_table) {}



static inline struct opp_table *dev_pm_opp_set_clkname(struct device *dev, const char *name)

{

	return ERR_PTR(-EOPNOTSUPP);

}



static inline void dev_pm_opp_put_clkname(struct opp_table *opp_table) {}



static inline int devm_pm_opp_set_clkname(struct device *dev, const char *name)

{

	return -EOPNOTSUPP;

}



static inline struct opp_table *dev_pm_opp_attach_genpd(struct device *dev, const char * const *names, struct device ***virt_devs)

{

	return ERR_PTR(-EOPNOTSUPP);
@@ -629,4 +614,30 @@ static inline int devm_pm_opp_set_supported_hw(struct device *dev, 
	return devm_pm_opp_set_config(dev, &config);

}



/* clkname helpers */

static inline int dev_pm_opp_set_clkname(struct device *dev, const char *name)

{

	const char *names[] = { name, NULL };

	struct dev_pm_opp_config config = {

		.clk_names = names,

	};



	return dev_pm_opp_set_config(dev, &config);

}



static inline void dev_pm_opp_put_clkname(int token)

{

	dev_pm_opp_clear_config(token);

}



static inline int devm_pm_opp_set_clkname(struct device *dev, const char *name)

{

	const char *names[] = { name, NULL };

	struct dev_pm_opp_config config = {

		.clk_names = names,

	};



	return devm_pm_opp_set_config(dev, &config);

}



#endif		/* __LINUX_OPP_H__ */