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

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

Merge branch 'pm-cpufreq' into fixes 

* pm-cpufreq:
  imx6q-cpufreq: fix return value check in imx6q_cpufreq_probe()
  PM / OPP: fix condition for empty of_init_opp_table()
parents 6ecf9680 3a3656d4

drivers/cpufreq/imx6q-cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev) 
	arm_reg = devm_regulator_get(cpu_dev, "arm");

	pu_reg = devm_regulator_get(cpu_dev, "pu");

	soc_reg = devm_regulator_get(cpu_dev, "soc");

	if (!arm_reg || !pu_reg || !soc_reg) {

	if (IS_ERR(arm_reg) || IS_ERR(pu_reg) || IS_ERR(soc_reg)) {

		dev_err(cpu_dev, "failed to get regulators\n");

		ret = -ENOENT;

		goto put_node;

include/linux/opp.h

+9 −9
Original line number Diff line number Diff line
@@ -47,15 +47,6 @@ int opp_enable(struct device *dev, unsigned long freq); 
int opp_disable(struct device *dev, unsigned long freq);



struct srcu_notifier_head *opp_get_notifier(struct device *dev);



#ifdef CONFIG_OF

int of_init_opp_table(struct device *dev);

#else

static inline int of_init_opp_table(struct device *dev)

{

	return -EINVAL;

}

#endif /* CONFIG_OF */

#else

static inline unsigned long opp_get_voltage(struct opp *opp)

{
@@ -112,6 +103,15 @@ static inline struct srcu_notifier_head *opp_get_notifier(struct device *dev) 
}

#endif		/* CONFIG_PM_OPP */



#if defined(CONFIG_PM_OPP) && defined(CONFIG_OF)

int of_init_opp_table(struct device *dev);

#else

static inline int of_init_opp_table(struct device *dev)

{

	return -EINVAL;

}

#endif



#if defined(CONFIG_CPU_FREQ) && defined(CONFIG_PM_OPP)

int opp_init_cpufreq_table(struct device *dev,

			    struct cpufreq_frequency_table **table);