mirror of
https://github.com/torvalds/linux.git
synced 2024-11-08 21:21:47 +00:00
2589d05612
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 at 558a0780 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 'tags/omap-for-v3.8/devel-prcm-signed' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3 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 at 558a0780 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. Conflicts: arch/arm/mach-omap2/cm33xx.c arch/arm/mach-omap2/io.c arch/arm/mach-omap2/prm_common.c
170 lines
4.3 KiB
C
170 lines
4.3 KiB
C
/*
|
|
* linux/arch/arm/mach-omap2/sdrc2xxx.c
|
|
*
|
|
* SDRAM timing related functions for OMAP2xxx
|
|
*
|
|
* Copyright (C) 2005, 2008 Texas Instruments Inc.
|
|
* Copyright (C) 2005, 2008 Nokia Corporation
|
|
*
|
|
* Tony Lindgren <tony@atomide.com>
|
|
* Paul Walmsley
|
|
* Richard Woodruff <r-woodruff2@ti.com>
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/device.h>
|
|
#include <linux/list.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/io.h>
|
|
|
|
#include "soc.h"
|
|
#include "iomap.h"
|
|
#include "common.h"
|
|
#include "prm2xxx.h"
|
|
#include "clock.h"
|
|
#include "sdrc.h"
|
|
#include "sram.h"
|
|
|
|
/* Memory timing, DLL mode flags */
|
|
#define M_DDR 1
|
|
#define M_LOCK_CTRL (1 << 2)
|
|
#define M_UNLOCK 0
|
|
#define M_LOCK 1
|
|
|
|
|
|
static struct memory_timings mem_timings;
|
|
static u32 curr_perf_level = CORE_CLK_SRC_DPLL_X2;
|
|
|
|
static u32 omap2xxx_sdrc_get_slow_dll_ctrl(void)
|
|
{
|
|
return mem_timings.slow_dll_ctrl;
|
|
}
|
|
|
|
static u32 omap2xxx_sdrc_get_fast_dll_ctrl(void)
|
|
{
|
|
return mem_timings.fast_dll_ctrl;
|
|
}
|
|
|
|
static u32 omap2xxx_sdrc_get_type(void)
|
|
{
|
|
return mem_timings.m_type;
|
|
}
|
|
|
|
/*
|
|
* Check the DLL lock state, and return tue if running in unlock mode.
|
|
* This is needed to compensate for the shifted DLL value in unlock mode.
|
|
*/
|
|
u32 omap2xxx_sdrc_dll_is_unlocked(void)
|
|
{
|
|
/* dlla and dllb are a set */
|
|
u32 dll_state = sdrc_read_reg(SDRC_DLLA_CTRL);
|
|
|
|
if ((dll_state & (1 << 2)) == (1 << 2))
|
|
return 1;
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* 'level' is the value to store to CM_CLKSEL2_PLL.CORE_CLK_SRC.
|
|
* Practical values are CORE_CLK_SRC_DPLL (for CORE_CLK = DPLL_CLK) or
|
|
* CORE_CLK_SRC_DPLL_X2 (for CORE_CLK = * DPLL_CLK * 2)
|
|
*
|
|
* Used by the clock framework during CORE DPLL changes
|
|
*/
|
|
u32 omap2xxx_sdrc_reprogram(u32 level, u32 force)
|
|
{
|
|
u32 dll_ctrl, m_type;
|
|
u32 prev = curr_perf_level;
|
|
unsigned long flags;
|
|
|
|
if ((curr_perf_level == level) && !force)
|
|
return prev;
|
|
|
|
if (level == CORE_CLK_SRC_DPLL)
|
|
dll_ctrl = omap2xxx_sdrc_get_slow_dll_ctrl();
|
|
else if (level == CORE_CLK_SRC_DPLL_X2)
|
|
dll_ctrl = omap2xxx_sdrc_get_fast_dll_ctrl();
|
|
else
|
|
return prev;
|
|
|
|
m_type = omap2xxx_sdrc_get_type();
|
|
|
|
local_irq_save(flags);
|
|
/*
|
|
* XXX These calls should be abstracted out through a
|
|
* prm2xxx.c function
|
|
*/
|
|
if (cpu_is_omap2420())
|
|
__raw_writel(0xffff, OMAP2420_PRCM_VOLTSETUP);
|
|
else
|
|
__raw_writel(0xffff, OMAP2430_PRCM_VOLTSETUP);
|
|
omap2_sram_reprogram_sdrc(level, dll_ctrl, m_type);
|
|
curr_perf_level = level;
|
|
local_irq_restore(flags);
|
|
|
|
return prev;
|
|
}
|
|
|
|
/* Used by the clock framework during CORE DPLL changes */
|
|
void omap2xxx_sdrc_init_params(u32 force_lock_to_unlock_mode)
|
|
{
|
|
unsigned long dll_cnt;
|
|
u32 fast_dll = 0;
|
|
|
|
/* DDR = 1, SDR = 0 */
|
|
mem_timings.m_type = !((sdrc_read_reg(SDRC_MR_0) & 0x3) == 0x1);
|
|
|
|
/* 2422 es2.05 and beyond has a single SIP DDR instead of 2 like others.
|
|
* In the case of 2422, its ok to use CS1 instead of CS0.
|
|
*/
|
|
if (cpu_is_omap2422())
|
|
mem_timings.base_cs = 1;
|
|
else
|
|
mem_timings.base_cs = 0;
|
|
|
|
if (mem_timings.m_type != M_DDR)
|
|
return;
|
|
|
|
/* With DDR we need to determine the low frequency DLL value */
|
|
if (((mem_timings.fast_dll_ctrl & (1 << 2)) == M_LOCK_CTRL))
|
|
mem_timings.dll_mode = M_UNLOCK;
|
|
else
|
|
mem_timings.dll_mode = M_LOCK;
|
|
|
|
if (mem_timings.base_cs == 0) {
|
|
fast_dll = sdrc_read_reg(SDRC_DLLA_CTRL);
|
|
dll_cnt = sdrc_read_reg(SDRC_DLLA_STATUS) & 0xff00;
|
|
} else {
|
|
fast_dll = sdrc_read_reg(SDRC_DLLB_CTRL);
|
|
dll_cnt = sdrc_read_reg(SDRC_DLLB_STATUS) & 0xff00;
|
|
}
|
|
if (force_lock_to_unlock_mode) {
|
|
fast_dll &= ~0xff00;
|
|
fast_dll |= dll_cnt; /* Current lock mode */
|
|
}
|
|
/* set fast timings with DLL filter disabled */
|
|
mem_timings.fast_dll_ctrl = (fast_dll | (3 << 8));
|
|
|
|
/* No disruptions, DDR will be offline & C-ABI not followed */
|
|
omap2_sram_ddr_init(&mem_timings.slow_dll_ctrl,
|
|
mem_timings.fast_dll_ctrl,
|
|
mem_timings.base_cs,
|
|
force_lock_to_unlock_mode);
|
|
mem_timings.slow_dll_ctrl &= 0xff00; /* Keep lock value */
|
|
|
|
/* Turn status into unlock ctrl */
|
|
mem_timings.slow_dll_ctrl |=
|
|
((mem_timings.fast_dll_ctrl & 0xF) | (1 << 2));
|
|
|
|
/* 90 degree phase for anything below 133Mhz + disable DLL filter */
|
|
mem_timings.slow_dll_ctrl |= ((1 << 1) | (3 << 8));
|
|
}
|