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

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

Merge branch 'cpufreq/arm/linux-next' of... 

Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm into pm-cpufreq

Pull cpufreq drivers material for v5.1 from Viresh Kumar:

"This contains:

- Minor cleanups for pcc, longhaul, powerenv and speedstep drivers (Yangtao Li).
- Moving configuration data out of mach directory for davinci (Bartosz Golaszewski)."

* 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
  cpufreq: davinci: move configuration to include/linux/platform_data
  cpufreq: speedstep: convert BUG() to BUG_ON()
  cpufreq: powernv: fix missing check of return value in init_powernv_pstates()
  cpufreq: longhaul: remove unneeded semicolon
  cpufreq: pcc-cpufreq: remove unneeded semicolon
parents b8bd1581 40b46b3b

arch/arm/mach-davinci/da850.c

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/mfd/da8xx-cfgchip.h>

#include <linux/platform_data/clk-da8xx-cfgchip.h>

#include <linux/platform_data/clk-davinci-pll.h>

#include <linux/platform_data/davinci-cpufreq.h>

#include <linux/platform_data/gpio-davinci.h>

#include <linux/platform_device.h>

#include <linux/regmap.h>
@@ -29,7 +30,6 @@ 
#include <asm/mach/map.h>



#include <mach/common.h>

#include <mach/cpufreq.h>

#include <mach/cputype.h>

#include <mach/da8xx.h>

#include <mach/irqs.h>

drivers/cpufreq/davinci-cpufreq.c

+1 −4
Original line number Diff line number Diff line
@@ -23,13 +23,10 @@ 
#include <linux/init.h>

#include <linux/err.h>

#include <linux/clk.h>

#include <linux/platform_data/davinci-cpufreq.h>

#include <linux/platform_device.h>

#include <linux/export.h>



#include <mach/hardware.h>

#include <mach/cpufreq.h>

#include <mach/common.h>



struct davinci_cpufreq {

	struct device *dev;

	struct clk *armclk;

drivers/cpufreq/longhaul.c

+1 −1
Original line number Diff line number Diff line
@@ -851,7 +851,7 @@ static int longhaul_cpu_init(struct cpufreq_policy *policy) 
	case TYPE_POWERSAVER:

		pr_cont("Powersaver supported\n");

		break;

	};

	}



	/* Doesn't hurt */

	longhaul_setup_southbridge();

drivers/cpufreq/pcc-cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ static int pcc_get_offset(int cpu) 
	if (!pccp || pccp->type != ACPI_TYPE_PACKAGE) {

		ret = -ENODEV;

		goto out_free;

	};

	}



	offset = &(pccp->package.elements[0]);

	if (!offset || offset->type != ACPI_TYPE_INTEGER) {

drivers/cpufreq/powernv-cpufreq.c

+7 −3
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ static int init_powernv_pstates(void) 
	u32 len_ids, len_freqs;

	u32 pstate_min, pstate_max, pstate_nominal;

	u32 pstate_turbo, pstate_ultra_turbo;

	int rc = -ENODEV;



	power_mgt = of_find_node_by_path("/ibm,opal/power-mgt");

	if (!power_mgt) {
@@ -327,8 +328,11 @@ static int init_powernv_pstates(void) 
		powernv_freqs[i].frequency = freq * 1000; /* kHz */

		powernv_freqs[i].driver_data = id & 0xFF;



		revmap_data = (struct pstate_idx_revmap_data *)

			      kmalloc(sizeof(*revmap_data), GFP_KERNEL);

		revmap_data = kmalloc(sizeof(*revmap_data), GFP_KERNEL);

		if (!revmap_data) {

			rc = -ENOMEM;

			goto out;

		}



		revmap_data->pstate_id = id & 0xFF;

		revmap_data->cpufreq_table_idx = i;
@@ -357,7 +361,7 @@ static int init_powernv_pstates(void) 
	return 0;

out:

	of_node_put(power_mgt);

	return -ENODEV;

	return rc;

}



/* Returns the CPU frequency corresponding to the pstate_id. */