cb64babf9e
Second set of OMAP PRCM cleanups for 3.8. These patches remove the use of omap_prcm_get_reset_sources() from the OMAP watchdog driver, and remove mach-omap2/prcm.c and plat-omap/include/plat/prcm.h. Basic test logs for this branch on top of Tony's cleanup-prcm branch at commit7fc54fd308
are here: http://www.pwsan.com/omap/testlogs/prcm_cleanup_b_3.8/20121108151646/ However, cleanup-prcm at7fc54fd3
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_prcm_cleanup_b_3.8/20121108151930/ which indicate that the series tests cleanly. This second pull request updates one of the patches which broke with rmk's allnoconfigs, and also updates the tag description to indicate that7fc54fd3
is building cleanly here. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJQoY0GAAoJEBvUPslcq6Vza0MQAI0idVoOclIHCC63tpc58YWA BpD5OLg4yRu0RUFS1CI/Fq5d+9PfYUspgaWja3TTgUy0EHRDVUUFRaxJdpWdl2NF gX7BCuhnQenznTbCE80nEmxvsh7U/dfvs+JYUK2PriypU61f1+TnSu9ZxTRvDJOx vbo1cfsioVcLfnBPSDSQVJ1fufbafklpeQkDNeRI8UDsCVeXwnxhNsXB3utoJMf0 5gaDaCdRBoimkLnAaLi41OnHYC7IbNCnl/VX0i/xffROsINfL7LDkBPfUOnR5vle jTCV49UEB/P5ekk2cvKKj8IOQZdimiCppWMLit6DObX7LbltTKuXx6T0PclgxQ14 hhav5O+f8NYA4yDAY/xxPlTvShMr8rQcYV6pg1G1OgD+dcq7cbbWNJAvbUJ03hH8 dqZ+ypLYkazb3Mm5XtpFr47gkoaFnCQbgZLXpjJ8+L01aGNrF2L6aE789So1N81+ X1s0ENjRxzDLNcqwxqhcoph0YQe7GlyiviYb7ev25MTSC3/TjrupTViZbKocZmLt Ad9m4SOktbHthAw0jdA48vOmPiSvmYzFiqzMhz/ryeNbyyV6rRxe5w4JUjPzHPxc U7NraSGIAzpqM3EKEp7Rb0yOfh6sGzML/FH9bS25+Rv37yKW0huc6ENIRgatZpY2 blLzsxaKfQgLeqKT82mj =tS2z -----END PGP SIGNATURE----- Merge tag 'omap-for-v3.8/cleanup-prcm-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup From Tony Lindgren <tony@atomide.com>: More PRCM cleanups via Paul Walmsley <paul@pwsan.com>: Second set of OMAP PRCM cleanups for 3.8. These patches remove the use of omap_prcm_get_reset_sources() from the OMAP watchdog driver, and remove mach-omap2/prcm.c and plat-omap/include/plat/prcm.h. Basic test logs for this branch on top of Tony's cleanup-prcm branch at commit7fc54fd308
are here: http://www.pwsan.com/omap/testlogs/prcm_cleanup_b_3.8/20121108151646/ However, cleanup-prcm at7fc54fd3
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_prcm_cleanup_b_3.8/20121108151930/ which indicate that the series tests cleanly. This second pull request updates one of the patches which broke with rmk's allnoconfigs, and also updates the tag description to indicate that7fc54fd3
is building cleanly here. * tag 'omap-for-v3.8/cleanup-prcm-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (27 commits) ARM: OMAP2: Fix compillation error in cm_common ARM: OMAP2+: PRCM: remove obsolete prcm.[ch] ARM: OMAP2+: hwmod: call to _omap4_disable_module() should use the SoC-specific call ARM: OMAP2+: PRCM: consolidate PRCM-related timeout macros ARM: OMAP2+: PRCM: split and relocate the PRM/CM globals setup ARM: OMAP2+: PRCM: remove omap2_cm_wait_idlest() ARM: OMAP2+: CM/clock: convert _omap2_module_wait_ready() to use SoC-independent CM functions ARM: OMAP2xxx: APLL/CM: convert to use omap2_cm_wait_module_ready() ARM: OMAP2+: board files: use SoC-specific system restart functions ARM: OMAP2+: PRCM: create SoC-specific chip restart functions ARM: OMAP2xxx: clock: move virt_prcm_set code into clkt2xxx_virt_prcm_set.c ARM: OMAP2xxx: clock: remove global 'dclk' variable ARM: OMAP2/3: PRM: add SoC reset functions (using the CORE DPLL method) ARM: OMAP2+: common: remove mach-omap2/common.c globals and map_common_io code ARM: OMAP2+: PRCM: remove omap_prcm_get_reset_sources() watchdog: OMAP: use standard GETBOOTSTATUS interface; use platform_data fn ptr ARM: OMAP2+: WDT: move init; add read_reset_sources pdata function pointer ARM: OMAP1: CGRM: fix omap1_get_reset_sources() return type ARM: OMAP2+: PRM: create PRM reset source API for the watchdog timer driver ARM: OMAP1: create read_reset_sources() function (for initial use by watchdog) ... Conflicts: arch/arm/mach-omap2/cm33xx.c arch/arm/mach-omap2/io.c arch/arm/mach-omap2/prm_common.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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));
|
|
}
|