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

Commit e27b4d4a authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-domains' 

Merge fixups for the recent extenstion of the generic power domains
(genpd) framework covering performance states.

* pm-domains:
  PM / Domains: Rename opp_node to np
  PM / Domains: Fix return value of of_genpd_opp_to_performance_state()
parents 649f53a3 ad6384ba

drivers/base/power/domain.c

+3 −4
Original line number Diff line number Diff line
@@ -2487,10 +2487,9 @@ EXPORT_SYMBOL_GPL(of_genpd_parse_idle_states); 
 * power domain corresponding to a DT node's "required-opps" property.

 *

 * @dev: Device for which the performance-state needs to be found.

 * @opp_node: DT node where the "required-opps" property is present. This can be

 * @np: DT node where the "required-opps" property is present. This can be

 *	the device node itself (if it doesn't have an OPP table) or a node

 *	within the OPP table of a device (if device has an OPP table).

 * @state: Pointer to return performance state.

 *

 * Returns performance state corresponding to the "required-opps" property of

 * a DT node. This calls platform specific genpd->opp_to_performance_state()
@@ -2499,7 +2498,7 @@ EXPORT_SYMBOL_GPL(of_genpd_parse_idle_states); 
 * Returns performance state on success and 0 on failure.

 */

unsigned int of_genpd_opp_to_performance_state(struct device *dev,

					       struct device_node *opp_node)

					       struct device_node *np)

{

	struct generic_pm_domain *genpd;

	struct dev_pm_opp *opp;
@@ -2514,7 +2513,7 @@ unsigned int of_genpd_opp_to_performance_state(struct device *dev, 


	genpd_lock(genpd);



	opp = of_dev_pm_opp_find_required_opp(&genpd->dev, opp_node);

	opp = of_dev_pm_opp_find_required_opp(&genpd->dev, np);

	if (IS_ERR(opp)) {

		dev_err(dev, "Failed to find required OPP: %ld\n",

			PTR_ERR(opp));

include/linux/pm_domain.h

+3 −3
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ struct generic_pm_domain *of_genpd_remove_last(struct device_node *np); 
int of_genpd_parse_idle_states(struct device_node *dn,

			       struct genpd_power_state **states, int *n);

unsigned int of_genpd_opp_to_performance_state(struct device *dev,

				struct device_node *opp_node);

				struct device_node *np);



int genpd_dev_pm_attach(struct device *dev);

struct device *genpd_dev_pm_attach_by_id(struct device *dev,
@@ -274,9 +274,9 @@ static inline int of_genpd_parse_idle_states(struct device_node *dn, 


static inline unsigned int

of_genpd_opp_to_performance_state(struct device *dev,

				  struct device_node *opp_node)

				  struct device_node *np)

{

	return -ENODEV;

	return 0;

}



static inline int genpd_dev_pm_attach(struct device *dev)