forked from Minki/linux
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>
336 lines
8.9 KiB
C
336 lines
8.9 KiB
C
/*
|
|
* AM33XX PRM functions
|
|
*
|
|
* Copyright (C) 2011-2012 Texas Instruments Incorporated - http://www.ti.com/
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation version 2.
|
|
*
|
|
* This program is distributed "as is" WITHOUT ANY WARRANTY of any
|
|
* kind, whether express or implied; without even the implied warranty
|
|
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/types.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/err.h>
|
|
#include <linux/io.h>
|
|
|
|
#include "common.h"
|
|
#include "powerdomain.h"
|
|
#include "prm33xx.h"
|
|
#include "prm-regbits-33xx.h"
|
|
|
|
/* Read a register in a PRM instance */
|
|
u32 am33xx_prm_read_reg(s16 inst, u16 idx)
|
|
{
|
|
return __raw_readl(prm_base + inst + idx);
|
|
}
|
|
|
|
/* Write into a register in a PRM instance */
|
|
void am33xx_prm_write_reg(u32 val, s16 inst, u16 idx)
|
|
{
|
|
__raw_writel(val, prm_base + inst + idx);
|
|
}
|
|
|
|
/* Read-modify-write a register in PRM. Caller must lock */
|
|
u32 am33xx_prm_rmw_reg_bits(u32 mask, u32 bits, s16 inst, s16 idx)
|
|
{
|
|
u32 v;
|
|
|
|
v = am33xx_prm_read_reg(inst, idx);
|
|
v &= ~mask;
|
|
v |= bits;
|
|
am33xx_prm_write_reg(v, inst, idx);
|
|
|
|
return v;
|
|
}
|
|
|
|
/**
|
|
* am33xx_prm_is_hardreset_asserted - read the HW reset line state of
|
|
* submodules contained in the hwmod module
|
|
* @shift: register bit shift corresponding to the reset line to check
|
|
* @inst: CM instance register offset (*_INST macro)
|
|
* @rstctrl_offs: RM_RSTCTRL register address offset for this module
|
|
*
|
|
* Returns 1 if the (sub)module hardreset line is currently asserted,
|
|
* 0 if the (sub)module hardreset line is not currently asserted, or
|
|
* -EINVAL upon parameter error.
|
|
*/
|
|
int am33xx_prm_is_hardreset_asserted(u8 shift, s16 inst, u16 rstctrl_offs)
|
|
{
|
|
u32 v;
|
|
|
|
v = am33xx_prm_read_reg(inst, rstctrl_offs);
|
|
v &= 1 << shift;
|
|
v >>= shift;
|
|
|
|
return v;
|
|
}
|
|
|
|
/**
|
|
* am33xx_prm_assert_hardreset - assert the HW reset line of a submodule
|
|
* @shift: register bit shift corresponding to the reset line to assert
|
|
* @inst: CM instance register offset (*_INST macro)
|
|
* @rstctrl_reg: RM_RSTCTRL register address for this module
|
|
*
|
|
* Some IPs like dsp, ipu or iva contain processors that require an HW
|
|
* reset line to be asserted / deasserted in order to fully enable the
|
|
* IP. These modules may have multiple hard-reset lines that reset
|
|
* different 'submodules' inside the IP block. This function will
|
|
* place the submodule into reset. Returns 0 upon success or -EINVAL
|
|
* upon an argument error.
|
|
*/
|
|
int am33xx_prm_assert_hardreset(u8 shift, s16 inst, u16 rstctrl_offs)
|
|
{
|
|
u32 mask = 1 << shift;
|
|
|
|
am33xx_prm_rmw_reg_bits(mask, mask, inst, rstctrl_offs);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* am33xx_prm_deassert_hardreset - deassert a submodule hardreset line and
|
|
* wait
|
|
* @shift: register bit shift corresponding to the reset line to deassert
|
|
* @inst: CM instance register offset (*_INST macro)
|
|
* @rstctrl_reg: RM_RSTCTRL register address for this module
|
|
* @rstst_reg: RM_RSTST register address for this module
|
|
*
|
|
* Some IPs like dsp, ipu or iva contain processors that require an HW
|
|
* reset line to be asserted / deasserted in order to fully enable the
|
|
* IP. These modules may have multiple hard-reset lines that reset
|
|
* different 'submodules' inside the IP block. This function will
|
|
* take the submodule out of reset and wait until the PRCM indicates
|
|
* that the reset has completed before returning. Returns 0 upon success or
|
|
* -EINVAL upon an argument error, -EEXIST if the submodule was already out
|
|
* of reset, or -EBUSY if the submodule did not exit reset promptly.
|
|
*/
|
|
int am33xx_prm_deassert_hardreset(u8 shift, s16 inst,
|
|
u16 rstctrl_offs, u16 rstst_offs)
|
|
{
|
|
int c;
|
|
u32 mask = 1 << shift;
|
|
|
|
/* Check the current status to avoid de-asserting the line twice */
|
|
if (am33xx_prm_is_hardreset_asserted(shift, inst, rstctrl_offs) == 0)
|
|
return -EEXIST;
|
|
|
|
/* Clear the reset status by writing 1 to the status bit */
|
|
am33xx_prm_rmw_reg_bits(0xffffffff, mask, inst, rstst_offs);
|
|
/* de-assert the reset control line */
|
|
am33xx_prm_rmw_reg_bits(mask, 0, inst, rstctrl_offs);
|
|
/* wait the status to be set */
|
|
|
|
omap_test_timeout(am33xx_prm_is_hardreset_asserted(shift, inst,
|
|
rstst_offs),
|
|
MAX_MODULE_HARDRESET_WAIT, c);
|
|
|
|
return (c == MAX_MODULE_HARDRESET_WAIT) ? -EBUSY : 0;
|
|
}
|
|
|
|
static int am33xx_pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst)
|
|
{
|
|
am33xx_prm_rmw_reg_bits(OMAP_POWERSTATE_MASK,
|
|
(pwrst << OMAP_POWERSTATE_SHIFT),
|
|
pwrdm->prcm_offs, pwrdm->pwrstctrl_offs);
|
|
return 0;
|
|
}
|
|
|
|
static int am33xx_pwrdm_read_next_pwrst(struct powerdomain *pwrdm)
|
|
{
|
|
u32 v;
|
|
|
|
v = am33xx_prm_read_reg(pwrdm->prcm_offs, pwrdm->pwrstctrl_offs);
|
|
v &= OMAP_POWERSTATE_MASK;
|
|
v >>= OMAP_POWERSTATE_SHIFT;
|
|
|
|
return v;
|
|
}
|
|
|
|
static int am33xx_pwrdm_read_pwrst(struct powerdomain *pwrdm)
|
|
{
|
|
u32 v;
|
|
|
|
v = am33xx_prm_read_reg(pwrdm->prcm_offs, pwrdm->pwrstst_offs);
|
|
v &= OMAP_POWERSTATEST_MASK;
|
|
v >>= OMAP_POWERSTATEST_SHIFT;
|
|
|
|
return v;
|
|
}
|
|
|
|
static int am33xx_pwrdm_read_prev_pwrst(struct powerdomain *pwrdm)
|
|
{
|
|
u32 v;
|
|
|
|
v = am33xx_prm_read_reg(pwrdm->prcm_offs, pwrdm->pwrstst_offs);
|
|
v &= AM33XX_LASTPOWERSTATEENTERED_MASK;
|
|
v >>= AM33XX_LASTPOWERSTATEENTERED_SHIFT;
|
|
|
|
return v;
|
|
}
|
|
|
|
static int am33xx_pwrdm_set_lowpwrstchange(struct powerdomain *pwrdm)
|
|
{
|
|
am33xx_prm_rmw_reg_bits(AM33XX_LOWPOWERSTATECHANGE_MASK,
|
|
(1 << AM33XX_LOWPOWERSTATECHANGE_SHIFT),
|
|
pwrdm->prcm_offs, pwrdm->pwrstctrl_offs);
|
|
return 0;
|
|
}
|
|
|
|
static int am33xx_pwrdm_clear_all_prev_pwrst(struct powerdomain *pwrdm)
|
|
{
|
|
am33xx_prm_rmw_reg_bits(AM33XX_LASTPOWERSTATEENTERED_MASK,
|
|
AM33XX_LASTPOWERSTATEENTERED_MASK,
|
|
pwrdm->prcm_offs, pwrdm->pwrstst_offs);
|
|
return 0;
|
|
}
|
|
|
|
static int am33xx_pwrdm_set_logic_retst(struct powerdomain *pwrdm, u8 pwrst)
|
|
{
|
|
u32 m;
|
|
|
|
m = pwrdm->logicretstate_mask;
|
|
if (!m)
|
|
return -EINVAL;
|
|
|
|
am33xx_prm_rmw_reg_bits(m, (pwrst << __ffs(m)),
|
|
pwrdm->prcm_offs, pwrdm->pwrstctrl_offs);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int am33xx_pwrdm_read_logic_pwrst(struct powerdomain *pwrdm)
|
|
{
|
|
u32 v;
|
|
|
|
v = am33xx_prm_read_reg(pwrdm->prcm_offs, pwrdm->pwrstst_offs);
|
|
v &= AM33XX_LOGICSTATEST_MASK;
|
|
v >>= AM33XX_LOGICSTATEST_SHIFT;
|
|
|
|
return v;
|
|
}
|
|
|
|
static int am33xx_pwrdm_read_logic_retst(struct powerdomain *pwrdm)
|
|
{
|
|
u32 v, m;
|
|
|
|
m = pwrdm->logicretstate_mask;
|
|
if (!m)
|
|
return -EINVAL;
|
|
|
|
v = am33xx_prm_read_reg(pwrdm->prcm_offs, pwrdm->pwrstctrl_offs);
|
|
v &= m;
|
|
v >>= __ffs(m);
|
|
|
|
return v;
|
|
}
|
|
|
|
static int am33xx_pwrdm_set_mem_onst(struct powerdomain *pwrdm, u8 bank,
|
|
u8 pwrst)
|
|
{
|
|
u32 m;
|
|
|
|
m = pwrdm->mem_on_mask[bank];
|
|
if (!m)
|
|
return -EINVAL;
|
|
|
|
am33xx_prm_rmw_reg_bits(m, (pwrst << __ffs(m)),
|
|
pwrdm->prcm_offs, pwrdm->pwrstctrl_offs);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int am33xx_pwrdm_set_mem_retst(struct powerdomain *pwrdm, u8 bank,
|
|
u8 pwrst)
|
|
{
|
|
u32 m;
|
|
|
|
m = pwrdm->mem_ret_mask[bank];
|
|
if (!m)
|
|
return -EINVAL;
|
|
|
|
am33xx_prm_rmw_reg_bits(m, (pwrst << __ffs(m)),
|
|
pwrdm->prcm_offs, pwrdm->pwrstctrl_offs);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int am33xx_pwrdm_read_mem_pwrst(struct powerdomain *pwrdm, u8 bank)
|
|
{
|
|
u32 m, v;
|
|
|
|
m = pwrdm->mem_pwrst_mask[bank];
|
|
if (!m)
|
|
return -EINVAL;
|
|
|
|
v = am33xx_prm_read_reg(pwrdm->prcm_offs, pwrdm->pwrstst_offs);
|
|
v &= m;
|
|
v >>= __ffs(m);
|
|
|
|
return v;
|
|
}
|
|
|
|
static int am33xx_pwrdm_read_mem_retst(struct powerdomain *pwrdm, u8 bank)
|
|
{
|
|
u32 m, v;
|
|
|
|
m = pwrdm->mem_retst_mask[bank];
|
|
if (!m)
|
|
return -EINVAL;
|
|
|
|
v = am33xx_prm_read_reg(pwrdm->prcm_offs, pwrdm->pwrstctrl_offs);
|
|
v &= m;
|
|
v >>= __ffs(m);
|
|
|
|
return v;
|
|
}
|
|
|
|
static int am33xx_pwrdm_wait_transition(struct powerdomain *pwrdm)
|
|
{
|
|
u32 c = 0;
|
|
|
|
/*
|
|
* REVISIT: pwrdm_wait_transition() may be better implemented
|
|
* via a callback and a periodic timer check -- how long do we expect
|
|
* powerdomain transitions to take?
|
|
*/
|
|
|
|
/* XXX Is this udelay() value meaningful? */
|
|
while ((am33xx_prm_read_reg(pwrdm->prcm_offs, pwrdm->pwrstst_offs)
|
|
& OMAP_INTRANSITION_MASK) &&
|
|
(c++ < PWRDM_TRANSITION_BAILOUT))
|
|
udelay(1);
|
|
|
|
if (c > PWRDM_TRANSITION_BAILOUT) {
|
|
pr_err("powerdomain: %s: waited too long to complete transition\n",
|
|
pwrdm->name);
|
|
return -EAGAIN;
|
|
}
|
|
|
|
pr_debug("powerdomain: completed transition in %d loops\n", c);
|
|
|
|
return 0;
|
|
}
|
|
|
|
struct pwrdm_ops am33xx_pwrdm_operations = {
|
|
.pwrdm_set_next_pwrst = am33xx_pwrdm_set_next_pwrst,
|
|
.pwrdm_read_next_pwrst = am33xx_pwrdm_read_next_pwrst,
|
|
.pwrdm_read_pwrst = am33xx_pwrdm_read_pwrst,
|
|
.pwrdm_read_prev_pwrst = am33xx_pwrdm_read_prev_pwrst,
|
|
.pwrdm_set_logic_retst = am33xx_pwrdm_set_logic_retst,
|
|
.pwrdm_read_logic_pwrst = am33xx_pwrdm_read_logic_pwrst,
|
|
.pwrdm_read_logic_retst = am33xx_pwrdm_read_logic_retst,
|
|
.pwrdm_clear_all_prev_pwrst = am33xx_pwrdm_clear_all_prev_pwrst,
|
|
.pwrdm_set_lowpwrstchange = am33xx_pwrdm_set_lowpwrstchange,
|
|
.pwrdm_read_mem_pwrst = am33xx_pwrdm_read_mem_pwrst,
|
|
.pwrdm_read_mem_retst = am33xx_pwrdm_read_mem_retst,
|
|
.pwrdm_set_mem_onst = am33xx_pwrdm_set_mem_onst,
|
|
.pwrdm_set_mem_retst = am33xx_pwrdm_set_mem_retst,
|
|
.pwrdm_wait_transition = am33xx_pwrdm_wait_transition,
|
|
};
|