Some miscellaneous OMAP hwmod changes for 3.8, along with a PRM change needed for one of the hwmod patches to function. Basic test logs for this branch on top of Tony's omap-for-v3.8/clock branch at commit558a0780b0
are here: http://www.pwsan.com/omap/testlogs/hwmod_devel_a_3.8/20121121161522/ However, omap-for-v3.8/clock at558a0780
does not include some fixes that are needed for a successful test. With several reverts, fixes, and workarounds applied, the following test logs were obtained: http://www.pwsan.com/omap/testlogs/TEST_hwmod_devel_a_3.8/20121121162719/ which indicate that the series tests cleanly. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJQs9J2AAoJEBvUPslcq6Vznz0QAM5Q8krs4fAZ35ekOnAAeh4a kWbkSq/VH74uPMbobUOeHVusJbfZBxm24CT/911wNXIHg/hku6WPhnQzStX2n/6w JKtHcQXeftgXecHBeyjDGdypcwknwTzIg78BECJi1FO+y/imaMjvxLDm74BXdBRF bLLmMLe2+Fnwz4IjwtOPz9mbje9NexMy+ppDyIVT36H+t9PQwDArOJMqLINWdioW e9LjUM4mr/5YZEOVu1tC30bJIcKq/m5yYS7dwifcSN67EsMUw90kQTKFtmNC2SzL DozIUHdsc990U65LhrH5EzoluT/tWPFl+ijkLmehfaVgSYIT5CmkDCgKUFNNY83r 7eVcPYvK8Nf2V8s0rMwy2mBy8j9p3Yug/kmOpRxdI90YCqxikJD5zdW+yQVX4qnt GXOyfw9BwK8g0Y7lEea1MN2s+y1E3n8EcaVyvQAW4N0wCkm3ELE6rm9HZoBXD3+d 4EovXn8DmTfvqiJ/M/FCqphyMMvp+NhO8Cg2vJUotEiCHdbIkaeXNI4AWg/sMlId aXUazd2i1WvynXvcSqJBbSKZQM+8GBPAuxqSQc8tP0JuOZo//sBYbXSUFClWksaw bvp+iJ6g/4/QqIG/B5EARSbkfCI1fTfTYObLe2Pd3cRdML3F0f/rCWRjPfl20BnQ weUVgyikcXT+aH2sfdIB =JSAM -----END PGP SIGNATURE----- Merge tag 'omap-for-v3.8/devel-prcm-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/pm2 From Tony Lindgren: omap prcm changes via Paul Walmsley <paul@pwsan.com>: Some miscellaneous OMAP hwmod changes for 3.8, along with a PRM change needed for one of the hwmod patches to function. Basic test logs for this branch on top of Tony's omap-for-v3.8/clock branch at commit558a0780b0
are here: http://www.pwsan.com/omap/testlogs/hwmod_devel_a_3.8/20121121161522/ However, omap-for-v3.8/clock at558a0780
does not include some fixes that are needed for a successful test. With several reverts, fixes, and workarounds applied, the following test logs were obtained: http://www.pwsan.com/omap/testlogs/TEST_hwmod_devel_a_3.8/20121121162719/ which indicate that the series tests cleanly. * tag 'omap-for-v3.8/devel-prcm-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (49 commits) ARM: OMAP2+: omap_device: Correct resource handling for DT boot ARM: OMAP2+: hwmod: Add possibility to count hwmod resources based on type ARM: OMAP2+: hwmod: Add support for per hwmod/module context lost count ARM: OMAP2+: PRM: initialize some PRM functions early ARM: OMAP2+: clock: Cleanup !CONFIG_COMMON_CLK parts ARM: OMAP2xxx: clock: drop obsolete clock data ARM: OMAP2: clock: Cleanup !CONFIG_COMMON_CLK parts ARM: OMAP3+: DPLL: drop !CONFIG_COMMON_CLK sections ARM: AM33xx: clock: drop obsolete clock data ARM: OMAP3xxx: clk: drop obsolete clock data ARM: OMAP3: clock: Cleanup !CONFIG_COMMON_CLK parts ARM: OMAP44xx: clock: drop obsolete clock data ARM: OMAP4: clock: Cleanup !CONFIG_COMMON_CLK parts ARM: OMAP: hwmod: Cleanup !CONFIG_COMMON_CLK parts ARM: OMAP: clock: Switch to COMMON clk ARM: OMAP2: clock: Add 24xx data using common struct clk ARM: OMAP3: clock: Add 3xxx data using common struct clk ARM: AM33XX: clock: add clock data in common clock format ARM: OMAP4: clock: Add 44xx data using common struct clk ARM: OMAP2+: clock: add OMAP CCF convenience macros to mach-omap2/clock.h ... Some context conflicts due to nearby changes resolved in arch/arm/mach-omap2/io.c. Signed-off-by: Olof Johansson <olof@lixom.net>
222 lines
6 KiB
C
222 lines
6 KiB
C
/*
|
|
* OMAP2xxx DVFS virtual clock functions
|
|
*
|
|
* Copyright (C) 2005-2008, 2012 Texas Instruments, Inc.
|
|
* Copyright (C) 2004-2010 Nokia Corporation
|
|
*
|
|
* Contacts:
|
|
* Richard Woodruff <r-woodruff2@ti.com>
|
|
* Paul Walmsley
|
|
*
|
|
* Based on earlier work by Tuukka Tikkanen, Tony Lindgren,
|
|
* Gordon McNutt and RidgeRun, Inc.
|
|
*
|
|
* 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.
|
|
*
|
|
* XXX Some of this code should be replaceable by the upcoming OPP layer
|
|
* code. However, some notion of "rate set" is probably still necessary
|
|
* for OMAP2xxx at least. Rate sets should be generalized so they can be
|
|
* used for any OMAP chip, not just OMAP2xxx. In particular, Richard Woodruff
|
|
* has in the past expressed a preference to use rate sets for OPP changes,
|
|
* rather than dynamically recalculating the clock tree, so if someone wants
|
|
* this badly enough to write the code to handle it, we should support it
|
|
* as an option.
|
|
*/
|
|
#undef DEBUG
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/io.h>
|
|
#include <linux/cpufreq.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include "soc.h"
|
|
#include "clock.h"
|
|
#include "clock2xxx.h"
|
|
#include "opp2xxx.h"
|
|
#include "cm2xxx.h"
|
|
#include "cm-regbits-24xx.h"
|
|
#include "sdrc.h"
|
|
#include "sram.h"
|
|
|
|
const struct prcm_config *curr_prcm_set;
|
|
const struct prcm_config *rate_table;
|
|
|
|
/*
|
|
* sys_ck_rate: the rate of the external high-frequency clock
|
|
* oscillator on the board. Set by the SoC-specific clock init code.
|
|
* Once set during a boot, will not change.
|
|
*/
|
|
static unsigned long sys_ck_rate;
|
|
|
|
/**
|
|
* omap2_table_mpu_recalc - just return the MPU speed
|
|
* @clk: virt_prcm_set struct clk
|
|
*
|
|
* Set virt_prcm_set's rate to the mpu_speed field of the current PRCM set.
|
|
*/
|
|
unsigned long omap2_table_mpu_recalc(struct clk_hw *clk,
|
|
unsigned long parent_rate)
|
|
{
|
|
return curr_prcm_set->mpu_speed;
|
|
}
|
|
|
|
/*
|
|
* Look for a rate equal or less than the target rate given a configuration set.
|
|
*
|
|
* What's not entirely clear is "which" field represents the key field.
|
|
* Some might argue L3-DDR, others ARM, others IVA. This code is simple and
|
|
* just uses the ARM rates.
|
|
*/
|
|
long omap2_round_to_table_rate(struct clk_hw *hw, unsigned long rate,
|
|
unsigned long *parent_rate)
|
|
{
|
|
const struct prcm_config *ptr;
|
|
long highest_rate;
|
|
|
|
highest_rate = -EINVAL;
|
|
|
|
for (ptr = rate_table; ptr->mpu_speed; ptr++) {
|
|
if (!(ptr->flags & cpu_mask))
|
|
continue;
|
|
if (ptr->xtal_speed != sys_ck_rate)
|
|
continue;
|
|
|
|
highest_rate = ptr->mpu_speed;
|
|
|
|
/* Can check only after xtal frequency check */
|
|
if (ptr->mpu_speed <= rate)
|
|
break;
|
|
}
|
|
return highest_rate;
|
|
}
|
|
|
|
/* Sets basic clocks based on the specified rate */
|
|
int omap2_select_table_rate(struct clk_hw *hw, unsigned long rate,
|
|
unsigned long parent_rate)
|
|
{
|
|
u32 cur_rate, done_rate, bypass = 0, tmp;
|
|
const struct prcm_config *prcm;
|
|
unsigned long found_speed = 0;
|
|
unsigned long flags;
|
|
|
|
for (prcm = rate_table; prcm->mpu_speed; prcm++) {
|
|
if (!(prcm->flags & cpu_mask))
|
|
continue;
|
|
|
|
if (prcm->xtal_speed != sys_ck_rate)
|
|
continue;
|
|
|
|
if (prcm->mpu_speed <= rate) {
|
|
found_speed = prcm->mpu_speed;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (!found_speed) {
|
|
printk(KERN_INFO "Could not set MPU rate to %luMHz\n",
|
|
rate / 1000000);
|
|
return -EINVAL;
|
|
}
|
|
|
|
curr_prcm_set = prcm;
|
|
cur_rate = omap2xxx_clk_get_core_rate();
|
|
|
|
if (prcm->dpll_speed == cur_rate / 2) {
|
|
omap2xxx_sdrc_reprogram(CORE_CLK_SRC_DPLL, 1);
|
|
} else if (prcm->dpll_speed == cur_rate * 2) {
|
|
omap2xxx_sdrc_reprogram(CORE_CLK_SRC_DPLL_X2, 1);
|
|
} else if (prcm->dpll_speed != cur_rate) {
|
|
local_irq_save(flags);
|
|
|
|
if (prcm->dpll_speed == prcm->xtal_speed)
|
|
bypass = 1;
|
|
|
|
if ((prcm->cm_clksel2_pll & OMAP24XX_CORE_CLK_SRC_MASK) ==
|
|
CORE_CLK_SRC_DPLL_X2)
|
|
done_rate = CORE_CLK_SRC_DPLL_X2;
|
|
else
|
|
done_rate = CORE_CLK_SRC_DPLL;
|
|
|
|
/* MPU divider */
|
|
omap2_cm_write_mod_reg(prcm->cm_clksel_mpu, MPU_MOD, CM_CLKSEL);
|
|
|
|
/* dsp + iva1 div(2420), iva2.1(2430) */
|
|
omap2_cm_write_mod_reg(prcm->cm_clksel_dsp,
|
|
OMAP24XX_DSP_MOD, CM_CLKSEL);
|
|
|
|
omap2_cm_write_mod_reg(prcm->cm_clksel_gfx, GFX_MOD, CM_CLKSEL);
|
|
|
|
/* Major subsystem dividers */
|
|
tmp = omap2_cm_read_mod_reg(CORE_MOD, CM_CLKSEL1) & OMAP24XX_CLKSEL_DSS2_MASK;
|
|
omap2_cm_write_mod_reg(prcm->cm_clksel1_core | tmp, CORE_MOD,
|
|
CM_CLKSEL1);
|
|
|
|
if (cpu_is_omap2430())
|
|
omap2_cm_write_mod_reg(prcm->cm_clksel_mdm,
|
|
OMAP2430_MDM_MOD, CM_CLKSEL);
|
|
|
|
/* x2 to enter omap2xxx_sdrc_init_params() */
|
|
omap2xxx_sdrc_reprogram(CORE_CLK_SRC_DPLL_X2, 1);
|
|
|
|
omap2_set_prcm(prcm->cm_clksel1_pll, prcm->base_sdrc_rfr,
|
|
bypass);
|
|
|
|
omap2xxx_sdrc_init_params(omap2xxx_sdrc_dll_is_unlocked());
|
|
omap2xxx_sdrc_reprogram(done_rate, 0);
|
|
|
|
local_irq_restore(flags);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* omap2xxx_clkt_vps_check_bootloader_rate - determine which of the rate
|
|
* table sets matches the current CORE DPLL hardware rate
|
|
*
|
|
* Check the MPU rate set by bootloader. Sets the 'curr_prcm_set'
|
|
* global to point to the active rate set when found; otherwise, sets
|
|
* it to NULL. No return value;
|
|
*/
|
|
void omap2xxx_clkt_vps_check_bootloader_rates(void)
|
|
{
|
|
const struct prcm_config *prcm = NULL;
|
|
unsigned long rate;
|
|
|
|
rate = omap2xxx_clk_get_core_rate();
|
|
for (prcm = rate_table; prcm->mpu_speed; prcm++) {
|
|
if (!(prcm->flags & cpu_mask))
|
|
continue;
|
|
if (prcm->xtal_speed != sys_ck_rate)
|
|
continue;
|
|
if (prcm->dpll_speed <= rate)
|
|
break;
|
|
}
|
|
curr_prcm_set = prcm;
|
|
}
|
|
|
|
/**
|
|
* omap2xxx_clkt_vps_late_init - store a copy of the sys_ck rate
|
|
*
|
|
* Store a copy of the sys_ck rate for later use by the OMAP2xxx DVFS
|
|
* code. (The sys_ck rate does not -- or rather, must not -- change
|
|
* during kernel runtime.) Must be called after we have a valid
|
|
* sys_ck rate, but before the virt_prcm_set clock rate is
|
|
* recalculated. No return value.
|
|
*/
|
|
void omap2xxx_clkt_vps_late_init(void)
|
|
{
|
|
struct clk *c;
|
|
|
|
c = clk_get(NULL, "sys_ck");
|
|
if (IS_ERR(c)) {
|
|
WARN(1, "could not locate sys_ck\n");
|
|
} else {
|
|
sys_ck_rate = clk_get_rate(c);
|
|
clk_put(c);
|
|
}
|
|
}
|