Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49815399 authored Oct 21, 2012 by Paul Walmsley

ARM: OMAP2+: powerdomain/PRM: move the low-level powerdomain functions into PRM



Move the low-level SoC-specific powerdomain control functions into
prm*.c.  For example, OMAP2xxx low-level powerdomain functions go into
prm2xxx.c.  Then remove the unnecessary powerdomain*xxx*.c files.

The objective is to centralize low-level PRM register accesses into
the prm*.[ch] files, and then to export an OMAP SoC-independent API to
higher-level OMAP power management code.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Rajendra Nayak <rnayak@ti.com>
Cc: Vaibhav Hiremath <hvaibhav@ti.com>
Acked-by: Rajendra Nayak <rnayak@ti.com>
Reviewed-by: Russ Dill <Russ.Dill@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>

parent 139563ad

arch/arm/mach-omap2/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -95,6 +95,7 @@ endif
		# PRCM
		obj-y += prcm.o prm_common.o
		obj-$(CONFIG_ARCH_OMAP2) += cm2xxx_3xxx.o prm2xxx_3xxx.o
		obj-$(CONFIG_ARCH_OMAP2) += prm2xxx.o
		obj-$(CONFIG_ARCH_OMAP3) += cm2xxx_3xxx.o prm2xxx_3xxx.o
		obj-$(CONFIG_ARCH_OMAP3) += prm3xxx.o
		obj-$(CONFIG_ARCH_OMAP3) += vc3xxx_data.o vp3xxx_data.o

arch/arm/mach-omap2/powerdomain2xxx_3xxx.c

deleted100644 → 0

+0 −242

Original line number	Diff line number	Diff line
		/*
		* OMAP2 and OMAP3 powerdomain control
		*
		* Copyright (C) 2009-2011 Texas Instruments, Inc.
		* Copyright (C) 2007-2009 Nokia Corporation
		*
		* Derived from mach-omap2/powerdomain.c written by Paul Walmsley
		* Rajendra Nayak <rnayak@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/io.h>
		#include <linux/errno.h>
		#include <linux/delay.h>
		#include <linux/bug.h>

		#include <plat/prcm.h>

		#include "powerdomain.h"
		#include "prm.h"
		#include "prm-regbits-24xx.h"
		#include "prm-regbits-34xx.h"


		/* Common functions across OMAP2 and OMAP3 */
		static int omap2_pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst)
		{
		omap2_prm_rmw_mod_reg_bits(OMAP_POWERSTATE_MASK,
		(pwrst << OMAP_POWERSTATE_SHIFT),
		pwrdm->prcm_offs, OMAP2_PM_PWSTCTRL);
		return 0;
		}

		static int omap2_pwrdm_read_next_pwrst(struct powerdomain *pwrdm)
		{
		return omap2_prm_read_mod_bits_shift(pwrdm->prcm_offs,
		OMAP2_PM_PWSTCTRL,
		OMAP_POWERSTATE_MASK);
		}

		static int omap2_pwrdm_read_pwrst(struct powerdomain *pwrdm)
		{
		return omap2_prm_read_mod_bits_shift(pwrdm->prcm_offs,
		OMAP2_PM_PWSTST,
		OMAP_POWERSTATEST_MASK);
		}

		static int omap2_pwrdm_set_mem_onst(struct powerdomain *pwrdm, u8 bank,
		u8 pwrst)
		{
		u32 m;

		m = omap2_pwrdm_get_mem_bank_onstate_mask(bank);

		omap2_prm_rmw_mod_reg_bits(m, (pwrst << __ffs(m)), pwrdm->prcm_offs,
		OMAP2_PM_PWSTCTRL);

		return 0;
		}

		static int omap2_pwrdm_set_mem_retst(struct powerdomain *pwrdm, u8 bank,
		u8 pwrst)
		{
		u32 m;

		m = omap2_pwrdm_get_mem_bank_retst_mask(bank);

		omap2_prm_rmw_mod_reg_bits(m, (pwrst << __ffs(m)), pwrdm->prcm_offs,
		OMAP2_PM_PWSTCTRL);

		return 0;
		}

		static int omap2_pwrdm_read_mem_pwrst(struct powerdomain *pwrdm, u8 bank)
		{
		u32 m;

		m = omap2_pwrdm_get_mem_bank_stst_mask(bank);

		return omap2_prm_read_mod_bits_shift(pwrdm->prcm_offs, OMAP2_PM_PWSTST,
		m);
		}

		static int omap2_pwrdm_read_mem_retst(struct powerdomain *pwrdm, u8 bank)
		{
		u32 m;

		m = omap2_pwrdm_get_mem_bank_retst_mask(bank);

		return omap2_prm_read_mod_bits_shift(pwrdm->prcm_offs,
		OMAP2_PM_PWSTCTRL, m);
		}

		static int omap2_pwrdm_set_logic_retst(struct powerdomain *pwrdm, u8 pwrst)
		{
		u32 v;

		v = pwrst << __ffs(OMAP3430_LOGICL1CACHERETSTATE_MASK);
		omap2_prm_rmw_mod_reg_bits(OMAP3430_LOGICL1CACHERETSTATE_MASK, v,
		pwrdm->prcm_offs, OMAP2_PM_PWSTCTRL);

		return 0;
		}

		static int omap2_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 ((omap2_prm_read_mod_reg(pwrdm->prcm_offs, OMAP2_PM_PWSTST) &
		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;
		}

		/* Applicable only for OMAP3. Not supported on OMAP2 */
		static int omap3_pwrdm_read_prev_pwrst(struct powerdomain *pwrdm)
		{
		return omap2_prm_read_mod_bits_shift(pwrdm->prcm_offs,
		OMAP3430_PM_PREPWSTST,
		OMAP3430_LASTPOWERSTATEENTERED_MASK);
		}

		static int omap3_pwrdm_read_logic_pwrst(struct powerdomain *pwrdm)
		{
		return omap2_prm_read_mod_bits_shift(pwrdm->prcm_offs,
		OMAP2_PM_PWSTST,
		OMAP3430_LOGICSTATEST_MASK);
		}

		static int omap3_pwrdm_read_logic_retst(struct powerdomain *pwrdm)
		{
		return omap2_prm_read_mod_bits_shift(pwrdm->prcm_offs,
		OMAP2_PM_PWSTCTRL,
		OMAP3430_LOGICSTATEST_MASK);
		}

		static int omap3_pwrdm_read_prev_logic_pwrst(struct powerdomain *pwrdm)
		{
		return omap2_prm_read_mod_bits_shift(pwrdm->prcm_offs,
		OMAP3430_PM_PREPWSTST,
		OMAP3430_LASTLOGICSTATEENTERED_MASK);
		}

		static int omap3_get_mem_bank_lastmemst_mask(u8 bank)
		{
		switch (bank) {
		case 0:
		return OMAP3430_LASTMEM1STATEENTERED_MASK;
		case 1:
		return OMAP3430_LASTMEM2STATEENTERED_MASK;
		case 2:
		return OMAP3430_LASTSHAREDL2CACHEFLATSTATEENTERED_MASK;
		case 3:
		return OMAP3430_LASTL2FLATMEMSTATEENTERED_MASK;
		default:
		WARN_ON(1); /* should never happen */
		return -EEXIST;
		}
		return 0;
		}

		static int omap3_pwrdm_read_prev_mem_pwrst(struct powerdomain *pwrdm, u8 bank)
		{
		u32 m;

		m = omap3_get_mem_bank_lastmemst_mask(bank);

		return omap2_prm_read_mod_bits_shift(pwrdm->prcm_offs,
		OMAP3430_PM_PREPWSTST, m);
		}

		static int omap3_pwrdm_clear_all_prev_pwrst(struct powerdomain *pwrdm)
		{
		omap2_prm_write_mod_reg(0, pwrdm->prcm_offs, OMAP3430_PM_PREPWSTST);
		return 0;
		}

		static int omap3_pwrdm_enable_hdwr_sar(struct powerdomain *pwrdm)
		{
		return omap2_prm_rmw_mod_reg_bits(0,
		1 << OMAP3430ES2_SAVEANDRESTORE_SHIFT,
		pwrdm->prcm_offs, OMAP2_PM_PWSTCTRL);
		}

		static int omap3_pwrdm_disable_hdwr_sar(struct powerdomain *pwrdm)
		{
		return omap2_prm_rmw_mod_reg_bits(1 << OMAP3430ES2_SAVEANDRESTORE_SHIFT,
		0, pwrdm->prcm_offs,
		OMAP2_PM_PWSTCTRL);
		}

		struct pwrdm_ops omap2_pwrdm_operations = {
		.pwrdm_set_next_pwrst = omap2_pwrdm_set_next_pwrst,
		.pwrdm_read_next_pwrst = omap2_pwrdm_read_next_pwrst,
		.pwrdm_read_pwrst = omap2_pwrdm_read_pwrst,
		.pwrdm_set_logic_retst = omap2_pwrdm_set_logic_retst,
		.pwrdm_set_mem_onst = omap2_pwrdm_set_mem_onst,
		.pwrdm_set_mem_retst = omap2_pwrdm_set_mem_retst,
		.pwrdm_read_mem_pwrst = omap2_pwrdm_read_mem_pwrst,
		.pwrdm_read_mem_retst = omap2_pwrdm_read_mem_retst,
		.pwrdm_wait_transition = omap2_pwrdm_wait_transition,
		};

		struct pwrdm_ops omap3_pwrdm_operations = {
		.pwrdm_set_next_pwrst = omap2_pwrdm_set_next_pwrst,
		.pwrdm_read_next_pwrst = omap2_pwrdm_read_next_pwrst,
		.pwrdm_read_pwrst = omap2_pwrdm_read_pwrst,
		.pwrdm_read_prev_pwrst = omap3_pwrdm_read_prev_pwrst,
		.pwrdm_set_logic_retst = omap2_pwrdm_set_logic_retst,
		.pwrdm_read_logic_pwrst = omap3_pwrdm_read_logic_pwrst,
		.pwrdm_read_logic_retst = omap3_pwrdm_read_logic_retst,
		.pwrdm_read_prev_logic_pwrst = omap3_pwrdm_read_prev_logic_pwrst,
		.pwrdm_set_mem_onst = omap2_pwrdm_set_mem_onst,
		.pwrdm_set_mem_retst = omap2_pwrdm_set_mem_retst,
		.pwrdm_read_mem_pwrst = omap2_pwrdm_read_mem_pwrst,
		.pwrdm_read_mem_retst = omap2_pwrdm_read_mem_retst,
		.pwrdm_read_prev_mem_pwrst = omap3_pwrdm_read_prev_mem_pwrst,
		.pwrdm_clear_all_prev_pwrst = omap3_pwrdm_clear_all_prev_pwrst,
		.pwrdm_enable_hdwr_sar = omap3_pwrdm_enable_hdwr_sar,
		.pwrdm_disable_hdwr_sar = omap3_pwrdm_disable_hdwr_sar,
		.pwrdm_wait_transition = omap2_pwrdm_wait_transition,
		};

arch/arm/mach-omap2/powerdomain33xx.c

deleted100644 → 0

+0 −229

Original line number	Diff line number	Diff line
		/*
		* AM33XX Powerdomain control
		*
		* Copyright (C) 2011-2012 Texas Instruments Incorporated - http://www.ti.com/
		*
		* Derived from mach-omap2/powerdomain44xx.c written by Rajendra Nayak
		* <rnayak@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/io.h>
		#include <linux/errno.h>
		#include <linux/delay.h>

		#include <plat/prcm.h>

		#include "powerdomain.h"
		#include "prm33xx.h"
		#include "prm-regbits-33xx.h"


		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,
		};

arch/arm/mach-omap2/powerdomain44xx.c

deleted100644 → 0

+0 −285

Original line number	Diff line number	Diff line
		/*
		* OMAP4 powerdomain control
		*
		* Copyright (C) 2009-2010, 2012 Texas Instruments, Inc.
		* Copyright (C) 2007-2009 Nokia Corporation
		*
		* Derived from mach-omap2/powerdomain.c written by Paul Walmsley
		* Rajendra Nayak <rnayak@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/io.h>
		#include <linux/errno.h>
		#include <linux/delay.h>
		#include <linux/bug.h>

		#include "powerdomain.h"
		#include <plat/prcm.h>
		#include "prm2xxx_3xxx.h"
		#include "prm44xx.h"
		#include "prminst44xx.h"
		#include "prm-regbits-44xx.h"

		static int omap4_pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst)
		{
		omap4_prminst_rmw_inst_reg_bits(OMAP_POWERSTATE_MASK,
		(pwrst << OMAP_POWERSTATE_SHIFT),
		pwrdm->prcm_partition,
		pwrdm->prcm_offs, OMAP4_PM_PWSTCTRL);
		return 0;
		}

		static int omap4_pwrdm_read_next_pwrst(struct powerdomain *pwrdm)
		{
		u32 v;

		v = omap4_prminst_read_inst_reg(pwrdm->prcm_partition, pwrdm->prcm_offs,
		OMAP4_PM_PWSTCTRL);
		v &= OMAP_POWERSTATE_MASK;
		v >>= OMAP_POWERSTATE_SHIFT;

		return v;
		}

		static int omap4_pwrdm_read_pwrst(struct powerdomain *pwrdm)
		{
		u32 v;

		v = omap4_prminst_read_inst_reg(pwrdm->prcm_partition, pwrdm->prcm_offs,
		OMAP4_PM_PWSTST);
		v &= OMAP_POWERSTATEST_MASK;
		v >>= OMAP_POWERSTATEST_SHIFT;

		return v;
		}

		static int omap4_pwrdm_read_prev_pwrst(struct powerdomain *pwrdm)
		{
		u32 v;

		v = omap4_prminst_read_inst_reg(pwrdm->prcm_partition, pwrdm->prcm_offs,
		OMAP4_PM_PWSTST);
		v &= OMAP4430_LASTPOWERSTATEENTERED_MASK;
		v >>= OMAP4430_LASTPOWERSTATEENTERED_SHIFT;

		return v;
		}

		static int omap4_pwrdm_set_lowpwrstchange(struct powerdomain *pwrdm)
		{
		omap4_prminst_rmw_inst_reg_bits(OMAP4430_LOWPOWERSTATECHANGE_MASK,
		(1 << OMAP4430_LOWPOWERSTATECHANGE_SHIFT),
		pwrdm->prcm_partition,
		pwrdm->prcm_offs, OMAP4_PM_PWSTCTRL);
		return 0;
		}

		static int omap4_pwrdm_clear_all_prev_pwrst(struct powerdomain *pwrdm)
		{
		omap4_prminst_rmw_inst_reg_bits(OMAP4430_LASTPOWERSTATEENTERED_MASK,
		OMAP4430_LASTPOWERSTATEENTERED_MASK,
		pwrdm->prcm_partition,
		pwrdm->prcm_offs, OMAP4_PM_PWSTST);
		return 0;
		}

		static int omap4_pwrdm_set_logic_retst(struct powerdomain *pwrdm, u8 pwrst)
		{
		u32 v;

		v = pwrst << __ffs(OMAP4430_LOGICRETSTATE_MASK);
		omap4_prminst_rmw_inst_reg_bits(OMAP4430_LOGICRETSTATE_MASK, v,
		pwrdm->prcm_partition, pwrdm->prcm_offs,
		OMAP4_PM_PWSTCTRL);

		return 0;
		}

		static int omap4_pwrdm_set_mem_onst(struct powerdomain *pwrdm, u8 bank,
		u8 pwrst)
		{
		u32 m;

		m = omap2_pwrdm_get_mem_bank_onstate_mask(bank);

		omap4_prminst_rmw_inst_reg_bits(m, (pwrst << __ffs(m)),
		pwrdm->prcm_partition, pwrdm->prcm_offs,
		OMAP4_PM_PWSTCTRL);

		return 0;
		}

		static int omap4_pwrdm_set_mem_retst(struct powerdomain *pwrdm, u8 bank,
		u8 pwrst)
		{
		u32 m;

		m = omap2_pwrdm_get_mem_bank_retst_mask(bank);

		omap4_prminst_rmw_inst_reg_bits(m, (pwrst << __ffs(m)),
		pwrdm->prcm_partition, pwrdm->prcm_offs,
		OMAP4_PM_PWSTCTRL);

		return 0;
		}

		static int omap4_pwrdm_read_logic_pwrst(struct powerdomain *pwrdm)
		{
		u32 v;

		v = omap4_prminst_read_inst_reg(pwrdm->prcm_partition, pwrdm->prcm_offs,
		OMAP4_PM_PWSTST);
		v &= OMAP4430_LOGICSTATEST_MASK;
		v >>= OMAP4430_LOGICSTATEST_SHIFT;

		return v;
		}

		static int omap4_pwrdm_read_logic_retst(struct powerdomain *pwrdm)
		{
		u32 v;

		v = omap4_prminst_read_inst_reg(pwrdm->prcm_partition, pwrdm->prcm_offs,
		OMAP4_PM_PWSTCTRL);
		v &= OMAP4430_LOGICRETSTATE_MASK;
		v >>= OMAP4430_LOGICRETSTATE_SHIFT;

		return v;
		}

		/**
		* omap4_pwrdm_read_prev_logic_pwrst - read the previous logic powerstate
		* @pwrdm: struct powerdomain * to read the state for
		*
		* Reads the previous logic powerstate for a powerdomain. This
		* function must determine the previous logic powerstate by first
		* checking the previous powerstate for the domain. If that was OFF,
		* then logic has been lost. If previous state was RETENTION, the
		* function reads the setting for the next retention logic state to
		* see the actual value. In every other case, the logic is
		* retained. Returns either PWRDM_POWER_OFF or PWRDM_POWER_RET
		* depending whether the logic was retained or not.
		*/
		static int omap4_pwrdm_read_prev_logic_pwrst(struct powerdomain *pwrdm)
		{
		int state;

		state = omap4_pwrdm_read_prev_pwrst(pwrdm);

		if (state == PWRDM_POWER_OFF)
		return PWRDM_POWER_OFF;

		if (state != PWRDM_POWER_RET)
		return PWRDM_POWER_RET;

		return omap4_pwrdm_read_logic_retst(pwrdm);
		}

		static int omap4_pwrdm_read_mem_pwrst(struct powerdomain *pwrdm, u8 bank)
		{
		u32 m, v;

		m = omap2_pwrdm_get_mem_bank_stst_mask(bank);

		v = omap4_prminst_read_inst_reg(pwrdm->prcm_partition, pwrdm->prcm_offs,
		OMAP4_PM_PWSTST);
		v &= m;
		v >>= __ffs(m);

		return v;
		}

		static int omap4_pwrdm_read_mem_retst(struct powerdomain *pwrdm, u8 bank)
		{
		u32 m, v;

		m = omap2_pwrdm_get_mem_bank_retst_mask(bank);

		v = omap4_prminst_read_inst_reg(pwrdm->prcm_partition, pwrdm->prcm_offs,
		OMAP4_PM_PWSTCTRL);
		v &= m;
		v >>= __ffs(m);

		return v;
		}

		/**
		* omap4_pwrdm_read_prev_mem_pwrst - reads the previous memory powerstate
		* @pwrdm: struct powerdomain * to read mem powerstate for
		* @bank: memory bank index
		*
		* Reads the previous memory powerstate for a powerdomain. This
		* function must determine the previous memory powerstate by first
		* checking the previous powerstate for the domain. If that was OFF,
		* then logic has been lost. If previous state was RETENTION, the
		* function reads the setting for the next memory retention state to
		* see the actual value. In every other case, the logic is
		* retained. Returns either PWRDM_POWER_OFF or PWRDM_POWER_RET
		* depending whether logic was retained or not.
		*/
		static int omap4_pwrdm_read_prev_mem_pwrst(struct powerdomain *pwrdm, u8 bank)
		{
		int state;

		state = omap4_pwrdm_read_prev_pwrst(pwrdm);

		if (state == PWRDM_POWER_OFF)
		return PWRDM_POWER_OFF;

		if (state != PWRDM_POWER_RET)
		return PWRDM_POWER_RET;

		return omap4_pwrdm_read_mem_retst(pwrdm, bank);
		}

		static int omap4_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 ((omap4_prminst_read_inst_reg(pwrdm->prcm_partition,
		pwrdm->prcm_offs,
		OMAP4_PM_PWSTST) &
		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 omap4_pwrdm_operations = {
		.pwrdm_set_next_pwrst = omap4_pwrdm_set_next_pwrst,
		.pwrdm_read_next_pwrst = omap4_pwrdm_read_next_pwrst,
		.pwrdm_read_pwrst = omap4_pwrdm_read_pwrst,
		.pwrdm_read_prev_pwrst = omap4_pwrdm_read_prev_pwrst,
		.pwrdm_set_lowpwrstchange = omap4_pwrdm_set_lowpwrstchange,
		.pwrdm_clear_all_prev_pwrst = omap4_pwrdm_clear_all_prev_pwrst,
		.pwrdm_set_logic_retst = omap4_pwrdm_set_logic_retst,
		.pwrdm_read_logic_pwrst = omap4_pwrdm_read_logic_pwrst,
		.pwrdm_read_prev_logic_pwrst = omap4_pwrdm_read_prev_logic_pwrst,
		.pwrdm_read_logic_retst = omap4_pwrdm_read_logic_retst,
		.pwrdm_read_mem_pwrst = omap4_pwrdm_read_mem_pwrst,
		.pwrdm_read_mem_retst = omap4_pwrdm_read_mem_retst,
		.pwrdm_read_prev_mem_pwrst = omap4_pwrdm_read_prev_mem_pwrst,
		.pwrdm_set_mem_onst = omap4_pwrdm_set_mem_onst,
		.pwrdm_set_mem_retst = omap4_pwrdm_set_mem_retst,
		.pwrdm_wait_transition = omap4_pwrdm_wait_transition,
		};

arch/arm/mach-omap2/prm2xxx.c

0 → 100644

+41 −0

Original line number	Diff line number	Diff line
		/*
		* OMAP2xxx PRM module functions
		*
		* Copyright (C) 2010-2012 Texas Instruments, Inc.
		* Copyright (C) 2010 Nokia Corporation
		* Benoît Cousson
		* Paul Walmsley
		* Rajendra Nayak <rnayak@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/kernel.h>
		#include <linux/errno.h>
		#include <linux/err.h>
		#include <linux/io.h>
		#include <linux/irq.h>

		#include "common.h"
		#include <plat/cpu.h>
		#include <plat/prcm.h>

		#include "vp.h"
		#include "powerdomain.h"
		#include "prm2xxx.h"
		#include "cm2xxx_3xxx.h"
		#include "prm-regbits-24xx.h"

		struct pwrdm_ops omap2_pwrdm_operations = {
		.pwrdm_set_next_pwrst = omap2_pwrdm_set_next_pwrst,
		.pwrdm_read_next_pwrst = omap2_pwrdm_read_next_pwrst,
		.pwrdm_read_pwrst = omap2_pwrdm_read_pwrst,
		.pwrdm_set_logic_retst = omap2_pwrdm_set_logic_retst,
		.pwrdm_set_mem_onst = omap2_pwrdm_set_mem_onst,
		.pwrdm_set_mem_retst = omap2_pwrdm_set_mem_retst,
		.pwrdm_read_mem_pwrst = omap2_pwrdm_read_mem_pwrst,
		.pwrdm_read_mem_retst = omap2_pwrdm_read_mem_retst,
		.pwrdm_wait_transition = omap2_pwrdm_wait_transition,
		};