Commit 96e61b8e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'ux500-cpufreq-for-arm-soc' of... 

Merge tag 'ux500-cpufreq-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/drivers

From Linus Walleij:
These are cpufreq updates for the ux500
- Updates to the ux500 cpufreq driver
- Support for delay timers in the MTU clksrc
- Consequential updates to the cpufreq driver

* tag 'ux500-cpufreq-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson

:
  cpufreq: db8500: set CPUFREQ_CONST_LOOPS
  clocksource: nomadik-mtu: support timer-based delay
  cpufreq: dbx500: Update file header
  cpufreq: dbx500: Minor code cleanup
  cpufreq: dbx500: Move clk_get to probe
  mfd: db8500: Update cpufreq device name
  cpufreq: Give driver used for dbx500 family a more generic name

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents d1c3ed66 ec669123

drivers/clocksource/nomadik-mtu.c

+11 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/clocksource.h>

#include <linux/clk.h>

#include <linux/jiffies.h>

#include <linux/delay.h>

#include <linux/err.h>

#include <linux/platform_data/clocksource-nomadik-mtu.h>

#include <asm/mach/time.h>
@@ -64,6 +65,7 @@ static void __iomem *mtu_base; 
static bool clkevt_periodic;

static u32 clk_prescale;

static u32 nmdk_cycle;		/* write-once */

static struct delay_timer mtu_delay_timer;



#ifdef CONFIG_NOMADIK_MTU_SCHED_CLOCK

/*
@@ -80,6 +82,11 @@ static u32 notrace nomadik_read_sched_clock(void) 
}

#endif



static unsigned long nmdk_timer_read_current_timer(void)

{

	return ~readl_relaxed(mtu_base + MTU_VAL(0));

}



/* Clockevent device: use one-shot mode */

static int nmdk_clkevt_next(unsigned long evt, struct clock_event_device *ev)

{
@@ -227,4 +234,8 @@ void __init nmdk_timer_init(void __iomem *base, int irq) 
	setup_irq(irq, &nmdk_timer_irq);

	nmdk_clkevt.cpumask = cpumask_of(0);

	clockevents_config_and_register(&nmdk_clkevt, rate, 2, 0xffffffffU);



	mtu_delay_timer.read_current_timer = &nmdk_timer_read_current_timer;

	mtu_delay_timer.freq = rate;

	register_current_timer_delay(&mtu_delay_timer);

}

drivers/cpufreq/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ obj-$(CONFIG_X86_CPUFREQ_NFORCE2) += cpufreq-nforce2.o 


##################################################################################

# ARM SoC drivers

obj-$(CONFIG_UX500_SOC_DB8500)		+= db8500-cpufreq.o

obj-$(CONFIG_UX500_SOC_DB8500)		+= dbx500-cpufreq.o

obj-$(CONFIG_ARM_S3C2416_CPUFREQ)	+= s3c2416-cpufreq.o

obj-$(CONFIG_ARM_S3C64XX_CPUFREQ)	+= s3c64xx-cpufreq.o

obj-$(CONFIG_ARM_S5PV210_CPUFREQ)	+= s5pv210-cpufreq.o

drivers/cpufreq/db8500-cpufreq.c→drivers/cpufreq/dbx500-cpufreq.c

+51 −50
Original line number Diff line number Diff line 
/*

 * Copyright (C) STMicroelectronics 2009

 * Copyright (C) ST-Ericsson SA 2010

 * Copyright (C) ST-Ericsson SA 2010-2012

 *

 * License Terms: GNU General Public License v2

 * Author: Sundar Iyer <sundar.iyer@stericsson.com>

 * Author: Martin Persson <martin.persson@stericsson.com>

 * Author: Jonas Aaberg <jonas.aberg@stericsson.com>

 *

 */



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/cpufreq.h>
@@ -20,22 +20,23 @@ 
static struct cpufreq_frequency_table *freq_table;

static struct clk *armss_clk;



static struct freq_attr *db8500_cpufreq_attr[] = {

static struct freq_attr *dbx500_cpufreq_attr[] = {

	&cpufreq_freq_attr_scaling_available_freqs,

	NULL,

};



static int db8500_cpufreq_verify_speed(struct cpufreq_policy *policy)

static int dbx500_cpufreq_verify_speed(struct cpufreq_policy *policy)

{

	return cpufreq_frequency_table_verify(policy, freq_table);

}



static int db8500_cpufreq_target(struct cpufreq_policy *policy,

static int dbx500_cpufreq_target(struct cpufreq_policy *policy,

				unsigned int target_freq,

				unsigned int relation)

{

	struct cpufreq_freqs freqs;

	unsigned int idx;

	int ret;



	/* scale the target frequency to one of the extremes supported */

	if (target_freq < policy->cpuinfo.min_freq)
@@ -44,10 +45,9 @@ static int db8500_cpufreq_target(struct cpufreq_policy *policy, 
		target_freq = policy->cpuinfo.max_freq;



	/* Lookup the next frequency */

	if (cpufreq_frequency_table_target

	    (policy, freq_table, target_freq, relation, &idx)) {

	if (cpufreq_frequency_table_target(policy, freq_table, target_freq,

					relation, &idx))

		return -EINVAL;

	}



	freqs.old = policy->cur;

	freqs.new = freq_table[idx].frequency;
@@ -60,9 +60,12 @@ static int db8500_cpufreq_target(struct cpufreq_policy *policy, 
		cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);



	/* update armss clk frequency */

	if (clk_set_rate(armss_clk, freq_table[idx].frequency * 1000)) {

		pr_err("db8500-cpufreq: Failed to update armss clk\n");

		return -EINVAL;

	ret = clk_set_rate(armss_clk, freqs.new * 1000);



	if (ret) {

		pr_err("dbx500-cpufreq: Failed to set armss_clk to %d Hz: error %d\n",

		       freqs.new * 1000, ret);

		return ret;

	}



	/* post change notification */
@@ -72,7 +75,7 @@ static int db8500_cpufreq_target(struct cpufreq_policy *policy, 
	return 0;

}



static unsigned int db8500_cpufreq_getspeed(unsigned int cpu)

static unsigned int dbx500_cpufreq_getspeed(unsigned int cpu)

{

	int i = 0;

	unsigned long freq = clk_get_rate(armss_clk) / 1000;
@@ -84,40 +87,26 @@ static unsigned int db8500_cpufreq_getspeed(unsigned int cpu) 
	}



	/* We could not find a corresponding frequency. */

	pr_err("db8500-cpufreq: Failed to find cpufreq speed\n");

	pr_err("dbx500-cpufreq: Failed to find cpufreq speed\n");

	return 0;

}



static int __cpuinit db8500_cpufreq_init(struct cpufreq_policy *policy)

static int __cpuinit dbx500_cpufreq_init(struct cpufreq_policy *policy)

{

	int i = 0;

	int res;



	armss_clk = clk_get(NULL, "armss");

	if (IS_ERR(armss_clk)) {

		pr_err("db8500-cpufreq : Failed to get armss clk\n");

		return PTR_ERR(armss_clk);

	}



	pr_info("db8500-cpufreq : Available frequencies:\n");

	while (freq_table[i].frequency != CPUFREQ_TABLE_END) {

		pr_info("  %d Mhz\n", freq_table[i].frequency/1000);

		i++;

	}



	/* get policy fields based on the table */

	res = cpufreq_frequency_table_cpuinfo(policy, freq_table);

	if (!res)

		cpufreq_frequency_table_get_attr(freq_table, policy->cpu);

	else {

		pr_err("db8500-cpufreq : Failed to read policy table\n");

		clk_put(armss_clk);

		pr_err("dbx500-cpufreq: Failed to read policy table\n");

		return res;

	}



	policy->min = policy->cpuinfo.min_freq;

	policy->max = policy->cpuinfo.max_freq;

	policy->cur = db8500_cpufreq_getspeed(policy->cpu);

	policy->cur = dbx500_cpufreq_getspeed(policy->cpu);

	policy->governor = CPUFREQ_DEFAULT_GOVERNOR;



	/*
@@ -135,45 +124,57 @@ static int __cpuinit db8500_cpufreq_init(struct cpufreq_policy *policy) 
	return 0;

}



static struct cpufreq_driver db8500_cpufreq_driver = {

	.flags  = CPUFREQ_STICKY,

	.verify = db8500_cpufreq_verify_speed,

	.target = db8500_cpufreq_target,

	.get    = db8500_cpufreq_getspeed,

	.init   = db8500_cpufreq_init,

	.name   = "DB8500",

	.attr   = db8500_cpufreq_attr,

static struct cpufreq_driver dbx500_cpufreq_driver = {

	.flags  = CPUFREQ_STICKY | CPUFREQ_CONST_LOOPS,

	.verify = dbx500_cpufreq_verify_speed,

	.target = dbx500_cpufreq_target,

	.get    = dbx500_cpufreq_getspeed,

	.init   = dbx500_cpufreq_init,

	.name   = "DBX500",

	.attr   = dbx500_cpufreq_attr,

};



static int db8500_cpufreq_probe(struct platform_device *pdev)

static int dbx500_cpufreq_probe(struct platform_device *pdev)

{

	freq_table = dev_get_platdata(&pdev->dev);

	int i = 0;



	freq_table = dev_get_platdata(&pdev->dev);

	if (!freq_table) {

		pr_err("db8500-cpufreq: Failed to fetch cpufreq table\n");

		pr_err("dbx500-cpufreq: Failed to fetch cpufreq table\n");

		return -ENODEV;

	}



	return cpufreq_register_driver(&db8500_cpufreq_driver);

	armss_clk = clk_get(&pdev->dev, "armss");

	if (IS_ERR(armss_clk)) {

		pr_err("dbx500-cpufreq: Failed to get armss clk\n");

		return PTR_ERR(armss_clk);

	}



	pr_info("dbx500-cpufreq: Available frequencies:\n");

	while (freq_table[i].frequency != CPUFREQ_TABLE_END) {

		pr_info("  %d Mhz\n", freq_table[i].frequency/1000);

		i++;

	}



	return cpufreq_register_driver(&dbx500_cpufreq_driver);

}



static struct platform_driver db8500_cpufreq_plat_driver = {

static struct platform_driver dbx500_cpufreq_plat_driver = {

	.driver = {

		.name = "cpufreq-u8500",

		.name = "cpufreq-ux500",

		.owner = THIS_MODULE,

	},

	.probe = db8500_cpufreq_probe,

	.probe = dbx500_cpufreq_probe,

};



static int __init db8500_cpufreq_register(void)

static int __init dbx500_cpufreq_register(void)

{

	if (!cpu_is_u8500_family())

		return -ENODEV;



	pr_info("cpufreq for DB8500 started\n");

	return platform_driver_register(&db8500_cpufreq_plat_driver);

	return platform_driver_register(&dbx500_cpufreq_plat_driver);

}

device_initcall(db8500_cpufreq_register);

device_initcall(dbx500_cpufreq_register);



MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("cpufreq driver for DB8500");
 
MODULE_DESCRIPTION("cpufreq driver for DBX500");

drivers/mfd/db8500-prcmu.c

+2 −2
Original line number Diff line number Diff line
@@ -3072,8 +3072,8 @@ static struct mfd_cell db8500_prcmu_devs[] = { 
		.pdata_size = sizeof(db8500_regulators),

	},

	{

		.name = "cpufreq-u8500",

		.of_compatible = "stericsson,cpufreq-u8500",

		.name = "cpufreq-ux500",

		.of_compatible = "stericsson,cpufreq-ux500",

		.platform_data = &db8500_cpufreq_table,

		.pdata_size = sizeof(db8500_cpufreq_table),

	},

CRA Git | Maintained and supported by SUSTech CRA and CCSE