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

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

Merge branch 'pm-opp' into pm-cpufreq

parents 7a6c79f2 d9de19b1

drivers/base/power/opp/core.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -814,7 +814,7 @@ static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev, 




	if (!prop) {

	if (!prop) {

		/* Search for "opp-microvolt" */

		/* Search for "opp-microvolt" */

		name[13] = '\0';

		sprintf(name, "opp-microvolt");

		prop = of_find_property(opp->np, name, NULL);

		prop = of_find_property(opp->np, name, NULL);





		/* Missing property isn't a problem, but an invalid entry is */

		/* Missing property isn't a problem, but an invalid entry is */
@@ -855,7 +855,7 @@ static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev, 




	if (!prop) {

	if (!prop) {

		/* Search for "opp-microamp" */

		/* Search for "opp-microamp" */

		name[12] = '\0';

		sprintf(name, "opp-microamp");

		prop = of_find_property(opp->np, name, NULL);

		prop = of_find_property(opp->np, name, NULL);

	}

	}

drivers/base/power/opp/cpu.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -214,7 +214,6 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_of_cpumask_add_table); 
/*

/*

 * Works only for OPP v2 bindings.

 * Works only for OPP v2 bindings.

 *

 *

 * cpumask should be already set to mask of cpu_dev->id.

 * Returns -ENOENT if operating-points-v2 bindings aren't supported.

 * Returns -ENOENT if operating-points-v2 bindings aren't supported.

 */

 */

int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, cpumask_var_t cpumask)

int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, cpumask_var_t cpumask)
@@ -230,6 +229,8 @@ int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, cpumask_var_t cpumask 
		return -ENOENT;

		return -ENOENT;

	}

	}





	cpumask_set_cpu(cpu_dev->id, cpumask);



	/* OPPs are shared ? */

	/* OPPs are shared ? */

	if (!of_property_read_bool(np, "opp-shared"))

	if (!of_property_read_bool(np, "opp-shared"))

		goto put_cpu_node;

		goto put_cpu_node;