Commit 731e0cc6 authored by Santosh Shilimkar's avatar Santosh Shilimkar Committed by Kevin Hilman
Browse files

cpufreq: OMAP: cleanup for multi-SoC support, move into drivers/cpufreq 



Move OMAP cpufreq driver from arch/arm/mach-omap2 into
drivers/cpufreq, along with a few cleanups:

- generalize support for better handling of different SoCs in the OMAP
- use OPP layer instead of OMAP clock internals for frequency table init

Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
[khilman@ti.com: move to drivers]
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent 1ea6b8f4

arch/arm/plat-omap/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ obj-$(CONFIG_ARCH_OMAP4) += omap_device.o 


obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o



obj-$(CONFIG_CPU_FREQ) += cpu-omap.o

obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o

obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o

obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o

drivers/cpufreq/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ obj-$(CONFIG_UX500_SOC_DB8500) += db8500-cpufreq.o 
obj-$(CONFIG_ARM_S3C64XX_CPUFREQ)	+= s3c64xx-cpufreq.o

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

obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ)	+= exynos4210-cpufreq.o

obj-$(CONFIG_ARCH_OMAP2PLUS)            += omap-cpufreq.o



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

# PowerPC platform drivers

arch/arm/plat-omap/cpu-omap.c→drivers/cpufreq/omap-cpufreq.c

+43 −26
Original line number Diff line number Diff line 
/*

 *  linux/arch/arm/plat-omap/cpu-omap.c

 *

 *  CPU frequency scaling for OMAP

 *

 *  Copyright (C) 2005 Nokia Corporation
@@ -8,6 +6,9 @@ 
 *

 *  Based on cpu-sa1110.c, Copyright (C) 2001 Russell King

 *

 * Copyright (C) 2007-2011 Texas Instruments, Inc.

 * - OMAP3/4 support by Rajendra Nayak, Santosh Shilimkar

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.
@@ -21,25 +22,22 @@ 
#include <linux/err.h>

#include <linux/clk.h>

#include <linux/io.h>

#include <linux/opp.h>



#include <mach/hardware.h>

#include <plat/clock.h>

#include <asm/system.h>

#include <asm/smp_plat.h>



#define VERY_HI_RATE	900000000

#include <plat/clock.h>

#include <plat/omap-pm.h>

#include <plat/common.h>



static struct cpufreq_frequency_table *freq_table;

#include <mach/hardware.h>



#ifdef CONFIG_ARCH_OMAP1

#define MPU_CLK		"mpu"

#else

#define MPU_CLK		"virt_prcm_set"

#endif

#define VERY_HI_RATE	900000000



static struct cpufreq_frequency_table *freq_table;

static struct clk *mpu_clk;



/* TODO: Add support for SDRAM timing changes */



static int omap_verify_speed(struct cpufreq_policy *policy)

{

	if (freq_table)
@@ -73,8 +71,8 @@ static int omap_target(struct cpufreq_policy *policy, 
		       unsigned int target_freq,

		       unsigned int relation)

{

	struct cpufreq_freqs freqs;

	int ret = 0;

	struct cpufreq_freqs freqs;



	/* Ensure desired rate is within allowed range.  Some govenors

	 * (ondemand) will just pass target_freq=0 to get the minimum. */
@@ -91,11 +89,13 @@ static int omap_target(struct cpufreq_policy *policy, 
		return ret;



	cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);



#ifdef CONFIG_CPU_FREQ_DEBUG

	printk(KERN_DEBUG "cpufreq-omap: transition: %u --> %u\n",

	       freqs.old, freqs.new);

	pr_info("cpufreq-omap: transition: %u --> %u\n", freqs.old, freqs.new);

#endif



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



	cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);



	return ret;
@@ -104,8 +104,15 @@ static int omap_target(struct cpufreq_policy *policy, 
static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy)

{

	int result = 0;

	struct device *mpu_dev;



	if (cpu_is_omap24xx())

		mpu_clk = clk_get(NULL, "virt_prcm_set");

	else if (cpu_is_omap34xx())

		mpu_clk = clk_get(NULL, "dpll1_ck");

	else if (cpu_is_omap44xx())

		mpu_clk = clk_get(NULL, "dpll_mpu_ck");



	mpu_clk = clk_get(NULL, MPU_CLK);

	if (IS_ERR(mpu_clk))

		return PTR_ERR(mpu_clk);
@@ -114,7 +121,13 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) 


	policy->cur = policy->min = policy->max = omap_getspeed(0);



	clk_init_cpufreq_table(&freq_table);

	mpu_dev = omap2_get_mpuss_device();

	if (!mpu_dev) {

		pr_warning("%s: unable to get the mpu device\n", __func__);

		return -EINVAL;

	}

	opp_init_cpufreq_table(mpu_dev, &freq_table);



	if (freq_table) {

		result = cpufreq_frequency_table_cpuinfo(policy, freq_table);

		if (!result)
@@ -126,6 +139,10 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) 
							VERY_HI_RATE) / 1000;

	}



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

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

	policy->cur = omap_getspeed(0);



	/* FIXME: what's the actual transition time? */

	policy->cpuinfo.transition_latency = 300 * 1000;
@@ -160,12 +177,12 @@ static int __init omap_cpufreq_init(void) 
	return cpufreq_register_driver(&omap_driver);

}



arch_initcall(omap_cpufreq_init);



/*

 * if ever we want to remove this, upon cleanup call:

 *

 * cpufreq_unregister_driver()

 * cpufreq_frequency_table_put_attr()

 */

static void __exit omap_cpufreq_exit(void)

{

	cpufreq_unregister_driver(&omap_driver);

}



MODULE_DESCRIPTION("cpufreq driver for OMAP SoCs");

MODULE_LICENSE("GPL");

module_init(omap_cpufreq_init);

module_exit(omap_cpufreq_exit);

CRA Git | Maintained and supported by SUSTech CRA and CCSE