2008-03-18 19:53:17 +07:00
|
|
|
#ifndef __ARCH_ARM_MACH_OMAP2_CM_REGBITS_34XX_H
|
|
|
|
#define __ARCH_ARM_MACH_OMAP2_CM_REGBITS_34XX_H
|
|
|
|
|
|
|
|
/*
|
|
|
|
* OMAP3430 Clock Management register bits
|
|
|
|
*
|
|
|
|
* Copyright (C) 2007-2008 Texas Instruments, Inc.
|
|
|
|
* Copyright (C) 2007-2008 Nokia Corporation
|
|
|
|
*
|
|
|
|
* Written by Paul Walmsley
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Bits shared between registers */
|
|
|
|
|
|
|
|
/* CM_FCLKEN1_CORE and CM_ICLKEN1_CORE shared bits */
|
|
|
|
#define OMAP3430ES2_EN_MMC3_MASK (1 << 30)
|
|
|
|
#define OMAP3430ES2_EN_MMC3_SHIFT 30
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_MSPRO_MASK (1 << 23)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_EN_MSPRO_SHIFT 23
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_HDQ_MASK (1 << 22)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_EN_HDQ_SHIFT 22
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430ES1_EN_FSHOSTUSB_MASK (1 << 5)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430ES1_EN_FSHOSTUSB_SHIFT 5
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430ES1_EN_D2D_MASK (1 << 3)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430ES1_EN_D2D_SHIFT 3
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_SSI_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_EN_SSI_SHIFT 0
|
|
|
|
|
|
|
|
/* CM_FCLKEN3_CORE and CM_ICLKEN3_CORE shared bits */
|
|
|
|
#define OMAP3430ES2_EN_USBTLL_SHIFT 2
|
|
|
|
#define OMAP3430ES2_EN_USBTLL_MASK (1 << 2)
|
|
|
|
|
|
|
|
/* CM_FCLKEN_WKUP and CM_ICLKEN_WKUP shared bits */
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_WDT2_MASK (1 << 5)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_EN_WDT2_SHIFT 5
|
|
|
|
|
|
|
|
/* CM_ICLKEN_CAM, CM_FCLKEN_CAM shared bits */
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_CAM_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_EN_CAM_SHIFT 0
|
|
|
|
|
|
|
|
/* CM_FCLKEN_PER, CM_ICLKEN_PER shared bits */
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_WDT3_MASK (1 << 12)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_EN_WDT3_SHIFT 12
|
|
|
|
|
|
|
|
/* CM_CLKSEL2_EMU, CM_CLKSEL3_EMU shared bits */
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_OVERRIDE_ENABLE_MASK (1 << 19)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
|
|
|
|
/* Bits specific to each register */
|
|
|
|
|
|
|
|
/* CM_FCLKEN_IVA2 */
|
2010-02-25 02:05:48 +07:00
|
|
|
#define OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_MASK (1 << 0)
|
2008-04-01 14:11:22 +07:00
|
|
|
#define OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_SHIFT 0
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_CLKEN_PLL_IVA2 */
|
|
|
|
#define OMAP3430_IVA2_DPLL_RAMPTIME_SHIFT 8
|
|
|
|
#define OMAP3430_IVA2_DPLL_RAMPTIME_MASK (0x3 << 8)
|
|
|
|
#define OMAP3430_IVA2_DPLL_FREQSEL_SHIFT 4
|
|
|
|
#define OMAP3430_IVA2_DPLL_FREQSEL_MASK (0xf << 4)
|
|
|
|
#define OMAP3430_EN_IVA2_DPLL_DRIFTGUARD_SHIFT 3
|
|
|
|
#define OMAP3430_EN_IVA2_DPLL_DRIFTGUARD_MASK (1 << 3)
|
|
|
|
#define OMAP3430_EN_IVA2_DPLL_SHIFT 0
|
|
|
|
#define OMAP3430_EN_IVA2_DPLL_MASK (0x7 << 0)
|
|
|
|
|
|
|
|
/* CM_IDLEST_IVA2 */
|
2012-09-04 00:50:52 +07:00
|
|
|
#define OMAP3430_ST_IVA2_SHIFT 0
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_ST_IVA2_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_IDLEST_PLL_IVA2 */
|
2008-07-03 16:24:45 +07:00
|
|
|
#define OMAP3430_ST_IVA2_CLK_SHIFT 0
|
|
|
|
#define OMAP3430_ST_IVA2_CLK_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_AUTOIDLE_PLL_IVA2 */
|
|
|
|
#define OMAP3430_AUTO_IVA2_DPLL_SHIFT 0
|
|
|
|
#define OMAP3430_AUTO_IVA2_DPLL_MASK (0x7 << 0)
|
|
|
|
|
|
|
|
/* CM_CLKSEL1_PLL_IVA2 */
|
|
|
|
#define OMAP3430_IVA2_CLK_SRC_SHIFT 19
|
2012-05-08 12:55:21 +07:00
|
|
|
#define OMAP3430_IVA2_CLK_SRC_MASK (0x7 << 19)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430_IVA2_CLK_SRC_WIDTH 3
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_IVA2_DPLL_MULT_SHIFT 8
|
|
|
|
#define OMAP3430_IVA2_DPLL_MULT_MASK (0x7ff << 8)
|
|
|
|
#define OMAP3430_IVA2_DPLL_DIV_SHIFT 0
|
|
|
|
#define OMAP3430_IVA2_DPLL_DIV_MASK (0x7f << 0)
|
|
|
|
|
|
|
|
/* CM_CLKSEL2_PLL_IVA2 */
|
|
|
|
#define OMAP3430_IVA2_DPLL_CLKOUT_DIV_SHIFT 0
|
|
|
|
#define OMAP3430_IVA2_DPLL_CLKOUT_DIV_MASK (0x1f << 0)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430_IVA2_DPLL_CLKOUT_DIV_WIDTH 5
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_CLKSTCTRL_IVA2 */
|
|
|
|
#define OMAP3430_CLKTRCTRL_IVA2_SHIFT 0
|
|
|
|
#define OMAP3430_CLKTRCTRL_IVA2_MASK (0x3 << 0)
|
|
|
|
|
|
|
|
/* CM_CLKSTST_IVA2 */
|
2008-08-19 15:08:44 +07:00
|
|
|
#define OMAP3430_CLKACTIVITY_IVA2_SHIFT 0
|
|
|
|
#define OMAP3430_CLKACTIVITY_IVA2_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_REVISION specific bits */
|
|
|
|
|
|
|
|
/* CM_SYSCONFIG specific bits */
|
|
|
|
|
|
|
|
/* CM_CLKEN_PLL_MPU */
|
|
|
|
#define OMAP3430_MPU_DPLL_RAMPTIME_SHIFT 8
|
|
|
|
#define OMAP3430_MPU_DPLL_RAMPTIME_MASK (0x3 << 8)
|
|
|
|
#define OMAP3430_MPU_DPLL_FREQSEL_SHIFT 4
|
|
|
|
#define OMAP3430_MPU_DPLL_FREQSEL_MASK (0xf << 4)
|
|
|
|
#define OMAP3430_EN_MPU_DPLL_DRIFTGUARD_SHIFT 3
|
|
|
|
#define OMAP3430_EN_MPU_DPLL_DRIFTGUARD_MASK (1 << 3)
|
|
|
|
#define OMAP3430_EN_MPU_DPLL_SHIFT 0
|
|
|
|
#define OMAP3430_EN_MPU_DPLL_MASK (0x7 << 0)
|
|
|
|
|
|
|
|
/* CM_IDLEST_MPU */
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_ST_MPU_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_IDLEST_PLL_MPU */
|
2008-07-03 16:24:45 +07:00
|
|
|
#define OMAP3430_ST_MPU_CLK_SHIFT 0
|
2008-03-14 02:35:09 +07:00
|
|
|
#define OMAP3430_ST_MPU_CLK_MASK (1 << 0)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430_ST_MPU_CLK_WIDTH 1
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_AUTOIDLE_PLL_MPU */
|
|
|
|
#define OMAP3430_AUTO_MPU_DPLL_SHIFT 0
|
|
|
|
#define OMAP3430_AUTO_MPU_DPLL_MASK (0x7 << 0)
|
|
|
|
|
|
|
|
/* CM_CLKSEL1_PLL_MPU */
|
|
|
|
#define OMAP3430_MPU_CLK_SRC_SHIFT 19
|
2012-05-08 12:55:21 +07:00
|
|
|
#define OMAP3430_MPU_CLK_SRC_MASK (0x7 << 19)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430_MPU_CLK_SRC_WIDTH 3
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_MPU_DPLL_MULT_SHIFT 8
|
|
|
|
#define OMAP3430_MPU_DPLL_MULT_MASK (0x7ff << 8)
|
|
|
|
#define OMAP3430_MPU_DPLL_DIV_SHIFT 0
|
|
|
|
#define OMAP3430_MPU_DPLL_DIV_MASK (0x7f << 0)
|
|
|
|
|
|
|
|
/* CM_CLKSEL2_PLL_MPU */
|
|
|
|
#define OMAP3430_MPU_DPLL_CLKOUT_DIV_SHIFT 0
|
|
|
|
#define OMAP3430_MPU_DPLL_CLKOUT_DIV_MASK (0x1f << 0)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430_MPU_DPLL_CLKOUT_DIV_WIDTH 5
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_CLKSTCTRL_MPU */
|
|
|
|
#define OMAP3430_CLKTRCTRL_MPU_SHIFT 0
|
|
|
|
#define OMAP3430_CLKTRCTRL_MPU_MASK (0x3 << 0)
|
|
|
|
|
|
|
|
/* CM_CLKSTST_MPU */
|
2008-08-19 15:08:44 +07:00
|
|
|
#define OMAP3430_CLKACTIVITY_MPU_SHIFT 0
|
|
|
|
#define OMAP3430_CLKACTIVITY_MPU_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_FCLKEN1_CORE specific bits */
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_MODEM_MASK (1 << 31)
|
2009-04-29 05:27:44 +07:00
|
|
|
#define OMAP3430_EN_MODEM_SHIFT 31
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_ICLKEN1_CORE specific bits */
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_ICR_MASK (1 << 29)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_EN_ICR_SHIFT 29
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_AES2_MASK (1 << 28)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_EN_AES2_SHIFT 28
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_SHA12_MASK (1 << 27)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_EN_SHA12_SHIFT 27
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_DES2_MASK (1 << 26)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_EN_DES2_SHIFT 26
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430ES1_EN_FAC_MASK (1 << 8)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430ES1_EN_FAC_SHIFT 8
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_MAILBOXES_MASK (1 << 7)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_EN_MAILBOXES_SHIFT 7
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_OMAPCTRL_MASK (1 << 6)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_EN_OMAPCTRL_SHIFT 6
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_SAD2D_MASK (1 << 3)
|
2009-04-29 05:27:44 +07:00
|
|
|
#define OMAP3430_EN_SAD2D_SHIFT 3
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_SDRC_MASK (1 << 1)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_EN_SDRC_SHIFT 1
|
|
|
|
|
2010-02-25 02:05:55 +07:00
|
|
|
/* AM35XX specific CM_ICLKEN1_CORE bits */
|
|
|
|
#define AM35XX_EN_IPSS_MASK (1 << 4)
|
|
|
|
#define AM35XX_EN_IPSS_SHIFT 4
|
|
|
|
|
2008-03-18 19:53:17 +07:00
|
|
|
/* CM_ICLKEN2_CORE */
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_PKA_MASK (1 << 4)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_EN_PKA_SHIFT 4
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_AES1_MASK (1 << 3)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_EN_AES1_SHIFT 3
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_RNG_MASK (1 << 2)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_EN_RNG_SHIFT 2
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_SHA11_MASK (1 << 1)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_EN_SHA11_SHIFT 1
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_DES1_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_EN_DES1_SHIFT 0
|
|
|
|
|
2009-04-29 05:27:44 +07:00
|
|
|
/* CM_ICLKEN3_CORE */
|
|
|
|
#define OMAP3430_EN_MAD2D_SHIFT 3
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_MAD2D_MASK (1 << 3)
|
2009-04-29 05:27:44 +07:00
|
|
|
|
2008-03-18 19:53:17 +07:00
|
|
|
/* CM_FCLKEN3_CORE specific bits */
|
|
|
|
#define OMAP3430ES2_EN_TS_SHIFT 1
|
|
|
|
#define OMAP3430ES2_EN_TS_MASK (1 << 1)
|
|
|
|
#define OMAP3430ES2_EN_CPEFUSE_SHIFT 0
|
|
|
|
#define OMAP3430ES2_EN_CPEFUSE_MASK (1 << 0)
|
|
|
|
|
|
|
|
/* CM_IDLEST1_CORE specific bits */
|
[ARM] OMAP2 PRCM: clean up CM_IDLEST bits
This patch fixes a few OMAP2xxx CM_IDLEST bits that were incorrectly
marked as being OMAP2xxx-wide, when they were actually 2420-specific.
Also, originally when the PRCM register macros were defined, bit shift
macros used a "_SHIFT" suffix, and mask macros used none. This became
a source of bugs and confusion, as the mask macros were mistakenly
used for shift values. Gradually, the mask macros have been updated,
piece by piece, to add a "_MASK" suffix on the end to clarify. This
patch applies this change to the CM_IDLEST_* register bits.
The patch also adds a few bits that were missing, mostly from the 3430ES1
to ES2 revisions.
linux-omap source commits are d18eff5b5fa15e170794397a6a94486d1f774f77,
e1f1a5cc24615fb790cc763c96d1c5cfe6296f5b, and part of
9fe6b6cf8d9e0cbb429fd64553a4b3160a9e99e1
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-01-29 02:18:22 +07:00
|
|
|
#define OMAP3430ES2_ST_MMC3_SHIFT 30
|
|
|
|
#define OMAP3430ES2_ST_MMC3_MASK (1 << 30)
|
|
|
|
#define OMAP3430_ST_ICR_SHIFT 29
|
|
|
|
#define OMAP3430_ST_ICR_MASK (1 << 29)
|
|
|
|
#define OMAP3430_ST_AES2_SHIFT 28
|
|
|
|
#define OMAP3430_ST_AES2_MASK (1 << 28)
|
|
|
|
#define OMAP3430_ST_SHA12_SHIFT 27
|
|
|
|
#define OMAP3430_ST_SHA12_MASK (1 << 27)
|
|
|
|
#define OMAP3430_ST_DES2_SHIFT 26
|
|
|
|
#define OMAP3430_ST_DES2_MASK (1 << 26)
|
|
|
|
#define OMAP3430_ST_MSPRO_SHIFT 23
|
|
|
|
#define OMAP3430_ST_MSPRO_MASK (1 << 23)
|
2012-06-28 03:53:46 +07:00
|
|
|
#define AM35XX_ST_UART4_SHIFT 23
|
|
|
|
#define AM35XX_ST_UART4_MASK (1 << 23)
|
[ARM] OMAP2 PRCM: clean up CM_IDLEST bits
This patch fixes a few OMAP2xxx CM_IDLEST bits that were incorrectly
marked as being OMAP2xxx-wide, when they were actually 2420-specific.
Also, originally when the PRCM register macros were defined, bit shift
macros used a "_SHIFT" suffix, and mask macros used none. This became
a source of bugs and confusion, as the mask macros were mistakenly
used for shift values. Gradually, the mask macros have been updated,
piece by piece, to add a "_MASK" suffix on the end to clarify. This
patch applies this change to the CM_IDLEST_* register bits.
The patch also adds a few bits that were missing, mostly from the 3430ES1
to ES2 revisions.
linux-omap source commits are d18eff5b5fa15e170794397a6a94486d1f774f77,
e1f1a5cc24615fb790cc763c96d1c5cfe6296f5b, and part of
9fe6b6cf8d9e0cbb429fd64553a4b3160a9e99e1
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-01-29 02:18:22 +07:00
|
|
|
#define OMAP3430_ST_HDQ_SHIFT 22
|
|
|
|
#define OMAP3430_ST_HDQ_MASK (1 << 22)
|
|
|
|
#define OMAP3430ES1_ST_FAC_SHIFT 8
|
|
|
|
#define OMAP3430ES1_ST_FAC_MASK (1 << 8)
|
|
|
|
#define OMAP3430ES2_ST_SSI_IDLE_SHIFT 8
|
|
|
|
#define OMAP3430ES2_ST_SSI_IDLE_MASK (1 << 8)
|
|
|
|
#define OMAP3430_ST_MAILBOXES_SHIFT 7
|
|
|
|
#define OMAP3430_ST_MAILBOXES_MASK (1 << 7)
|
|
|
|
#define OMAP3430_ST_OMAPCTRL_SHIFT 6
|
|
|
|
#define OMAP3430_ST_OMAPCTRL_MASK (1 << 6)
|
2012-09-24 06:28:21 +07:00
|
|
|
#define OMAP3430_ST_SAD2D_SHIFT 3
|
|
|
|
#define OMAP3430_ST_SAD2D_MASK (1 << 3)
|
[ARM] OMAP2 PRCM: clean up CM_IDLEST bits
This patch fixes a few OMAP2xxx CM_IDLEST bits that were incorrectly
marked as being OMAP2xxx-wide, when they were actually 2420-specific.
Also, originally when the PRCM register macros were defined, bit shift
macros used a "_SHIFT" suffix, and mask macros used none. This became
a source of bugs and confusion, as the mask macros were mistakenly
used for shift values. Gradually, the mask macros have been updated,
piece by piece, to add a "_MASK" suffix on the end to clarify. This
patch applies this change to the CM_IDLEST_* register bits.
The patch also adds a few bits that were missing, mostly from the 3430ES1
to ES2 revisions.
linux-omap source commits are d18eff5b5fa15e170794397a6a94486d1f774f77,
e1f1a5cc24615fb790cc763c96d1c5cfe6296f5b, and part of
9fe6b6cf8d9e0cbb429fd64553a4b3160a9e99e1
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-01-29 02:18:22 +07:00
|
|
|
#define OMAP3430_ST_SDMA_SHIFT 2
|
|
|
|
#define OMAP3430_ST_SDMA_MASK (1 << 2)
|
|
|
|
#define OMAP3430_ST_SDRC_SHIFT 1
|
|
|
|
#define OMAP3430_ST_SDRC_MASK (1 << 1)
|
|
|
|
#define OMAP3430_ST_SSI_STDBY_SHIFT 0
|
|
|
|
#define OMAP3430_ST_SSI_STDBY_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
2010-02-25 02:05:55 +07:00
|
|
|
/* AM35xx specific CM_IDLEST1_CORE bits */
|
|
|
|
#define AM35XX_ST_IPSS_SHIFT 5
|
|
|
|
#define AM35XX_ST_IPSS_MASK (1 << 5)
|
|
|
|
|
2008-03-18 19:53:17 +07:00
|
|
|
/* CM_IDLEST2_CORE */
|
[ARM] OMAP2 PRCM: clean up CM_IDLEST bits
This patch fixes a few OMAP2xxx CM_IDLEST bits that were incorrectly
marked as being OMAP2xxx-wide, when they were actually 2420-specific.
Also, originally when the PRCM register macros were defined, bit shift
macros used a "_SHIFT" suffix, and mask macros used none. This became
a source of bugs and confusion, as the mask macros were mistakenly
used for shift values. Gradually, the mask macros have been updated,
piece by piece, to add a "_MASK" suffix on the end to clarify. This
patch applies this change to the CM_IDLEST_* register bits.
The patch also adds a few bits that were missing, mostly from the 3430ES1
to ES2 revisions.
linux-omap source commits are d18eff5b5fa15e170794397a6a94486d1f774f77,
e1f1a5cc24615fb790cc763c96d1c5cfe6296f5b, and part of
9fe6b6cf8d9e0cbb429fd64553a4b3160a9e99e1
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-01-29 02:18:22 +07:00
|
|
|
#define OMAP3430_ST_PKA_SHIFT 4
|
|
|
|
#define OMAP3430_ST_PKA_MASK (1 << 4)
|
|
|
|
#define OMAP3430_ST_AES1_SHIFT 3
|
|
|
|
#define OMAP3430_ST_AES1_MASK (1 << 3)
|
|
|
|
#define OMAP3430_ST_RNG_SHIFT 2
|
|
|
|
#define OMAP3430_ST_RNG_MASK (1 << 2)
|
|
|
|
#define OMAP3430_ST_SHA11_SHIFT 1
|
|
|
|
#define OMAP3430_ST_SHA11_MASK (1 << 1)
|
|
|
|
#define OMAP3430_ST_DES1_SHIFT 0
|
|
|
|
#define OMAP3430_ST_DES1_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_IDLEST3_CORE */
|
|
|
|
#define OMAP3430ES2_ST_USBTLL_SHIFT 2
|
|
|
|
#define OMAP3430ES2_ST_USBTLL_MASK (1 << 2)
|
[ARM] OMAP2 PRCM: clean up CM_IDLEST bits
This patch fixes a few OMAP2xxx CM_IDLEST bits that were incorrectly
marked as being OMAP2xxx-wide, when they were actually 2420-specific.
Also, originally when the PRCM register macros were defined, bit shift
macros used a "_SHIFT" suffix, and mask macros used none. This became
a source of bugs and confusion, as the mask macros were mistakenly
used for shift values. Gradually, the mask macros have been updated,
piece by piece, to add a "_MASK" suffix on the end to clarify. This
patch applies this change to the CM_IDLEST_* register bits.
The patch also adds a few bits that were missing, mostly from the 3430ES1
to ES2 revisions.
linux-omap source commits are d18eff5b5fa15e170794397a6a94486d1f774f77,
e1f1a5cc24615fb790cc763c96d1c5cfe6296f5b, and part of
9fe6b6cf8d9e0cbb429fd64553a4b3160a9e99e1
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-01-29 02:18:22 +07:00
|
|
|
#define OMAP3430ES2_ST_CPEFUSE_SHIFT 0
|
|
|
|
#define OMAP3430ES2_ST_CPEFUSE_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_AUTOIDLE1_CORE */
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_MODEM_MASK (1 << 31)
|
2009-04-29 05:27:44 +07:00
|
|
|
#define OMAP3430_AUTO_MODEM_SHIFT 31
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430ES2_AUTO_MMC3_MASK (1 << 30)
|
2008-05-16 17:58:18 +07:00
|
|
|
#define OMAP3430ES2_AUTO_MMC3_SHIFT 30
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430ES2_AUTO_ICR_MASK (1 << 29)
|
2008-05-16 17:58:18 +07:00
|
|
|
#define OMAP3430ES2_AUTO_ICR_SHIFT 29
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_AES2_MASK (1 << 28)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_AES2_SHIFT 28
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_SHA12_MASK (1 << 27)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_SHA12_SHIFT 27
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_DES2_MASK (1 << 26)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_DES2_SHIFT 26
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_MMC2_MASK (1 << 25)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_MMC2_SHIFT 25
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_MMC1_MASK (1 << 24)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_MMC1_SHIFT 24
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_MSPRO_MASK (1 << 23)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_MSPRO_SHIFT 23
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_HDQ_MASK (1 << 22)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_HDQ_SHIFT 22
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_MCSPI4_MASK (1 << 21)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_MCSPI4_SHIFT 21
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_MCSPI3_MASK (1 << 20)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_MCSPI3_SHIFT 20
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_MCSPI2_MASK (1 << 19)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_MCSPI2_SHIFT 19
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_MCSPI1_MASK (1 << 18)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_MCSPI1_SHIFT 18
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_I2C3_MASK (1 << 17)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_I2C3_SHIFT 17
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_I2C2_MASK (1 << 16)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_I2C2_SHIFT 16
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_I2C1_MASK (1 << 15)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_I2C1_SHIFT 15
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_UART2_MASK (1 << 14)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_UART2_SHIFT 14
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_UART1_MASK (1 << 13)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_UART1_SHIFT 13
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_GPT11_MASK (1 << 12)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_GPT11_SHIFT 12
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_GPT10_MASK (1 << 11)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_GPT10_SHIFT 11
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_MCBSP5_MASK (1 << 10)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_MCBSP5_SHIFT 10
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_MCBSP1_MASK (1 << 9)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_MCBSP1_SHIFT 9
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430ES1_AUTO_FAC_MASK (1 << 8)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430ES1_AUTO_FAC_SHIFT 8
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_MAILBOXES_MASK (1 << 7)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_MAILBOXES_SHIFT 7
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_OMAPCTRL_MASK (1 << 6)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_OMAPCTRL_SHIFT 6
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430ES1_AUTO_FSHOSTUSB_MASK (1 << 5)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430ES1_AUTO_FSHOSTUSB_SHIFT 5
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_HSOTGUSB_MASK (1 << 4)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_HSOTGUSB_SHIFT 4
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430ES1_AUTO_D2D_MASK (1 << 3)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430ES1_AUTO_D2D_SHIFT 3
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_SAD2D_MASK (1 << 3)
|
2009-04-29 05:27:44 +07:00
|
|
|
#define OMAP3430_AUTO_SAD2D_SHIFT 3
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_SSI_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_SSI_SHIFT 0
|
|
|
|
|
|
|
|
/* CM_AUTOIDLE2_CORE */
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_PKA_MASK (1 << 4)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_PKA_SHIFT 4
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_AES1_MASK (1 << 3)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_AES1_SHIFT 3
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_RNG_MASK (1 << 2)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_RNG_SHIFT 2
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_SHA11_MASK (1 << 1)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_SHA11_SHIFT 1
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_DES1_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_DES1_SHIFT 0
|
|
|
|
|
|
|
|
/* CM_AUTOIDLE3_CORE */
|
2008-05-16 17:58:18 +07:00
|
|
|
#define OMAP3430ES2_AUTO_USBHOST (1 << 0)
|
|
|
|
#define OMAP3430ES2_AUTO_USBHOST_SHIFT 0
|
|
|
|
#define OMAP3430ES2_AUTO_USBTLL (1 << 2)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430ES2_AUTO_USBTLL_SHIFT 2
|
|
|
|
#define OMAP3430ES2_AUTO_USBTLL_MASK (1 << 2)
|
2009-04-29 05:27:44 +07:00
|
|
|
#define OMAP3430_AUTO_MAD2D_SHIFT 3
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_MAD2D_MASK (1 << 3)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_CLKSEL_CORE */
|
|
|
|
#define OMAP3430_CLKSEL_SSI_SHIFT 8
|
|
|
|
#define OMAP3430_CLKSEL_SSI_MASK (0xf << 8)
|
|
|
|
#define OMAP3430_CLKSEL_GPT11_MASK (1 << 7)
|
|
|
|
#define OMAP3430_CLKSEL_GPT11_SHIFT 7
|
|
|
|
#define OMAP3430_CLKSEL_GPT10_MASK (1 << 6)
|
|
|
|
#define OMAP3430_CLKSEL_GPT10_SHIFT 6
|
|
|
|
#define OMAP3430ES1_CLKSEL_FSHOSTUSB_SHIFT 4
|
|
|
|
#define OMAP3430ES1_CLKSEL_FSHOSTUSB_MASK (0x3 << 4)
|
|
|
|
#define OMAP3430_CLKSEL_L4_SHIFT 2
|
|
|
|
#define OMAP3430_CLKSEL_L4_MASK (0x3 << 2)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430_CLKSEL_L4_WIDTH 2
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_CLKSEL_L3_SHIFT 0
|
|
|
|
#define OMAP3430_CLKSEL_L3_MASK (0x3 << 0)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430_CLKSEL_L3_WIDTH 2
|
2010-02-23 12:09:10 +07:00
|
|
|
#define OMAP3630_CLKSEL_96M_SHIFT 12
|
|
|
|
#define OMAP3630_CLKSEL_96M_MASK (0x3 << 12)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3630_CLKSEL_96M_WIDTH 2
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_CLKSTCTRL_CORE */
|
|
|
|
#define OMAP3430ES1_CLKTRCTRL_D2D_SHIFT 4
|
|
|
|
#define OMAP3430ES1_CLKTRCTRL_D2D_MASK (0x3 << 4)
|
|
|
|
#define OMAP3430_CLKTRCTRL_L4_SHIFT 2
|
|
|
|
#define OMAP3430_CLKTRCTRL_L4_MASK (0x3 << 2)
|
|
|
|
#define OMAP3430_CLKTRCTRL_L3_SHIFT 0
|
|
|
|
#define OMAP3430_CLKTRCTRL_L3_MASK (0x3 << 0)
|
|
|
|
|
|
|
|
/* CM_CLKSTST_CORE */
|
2008-08-19 15:08:44 +07:00
|
|
|
#define OMAP3430ES1_CLKACTIVITY_D2D_SHIFT 2
|
|
|
|
#define OMAP3430ES1_CLKACTIVITY_D2D_MASK (1 << 2)
|
|
|
|
#define OMAP3430_CLKACTIVITY_L4_SHIFT 1
|
|
|
|
#define OMAP3430_CLKACTIVITY_L4_MASK (1 << 1)
|
|
|
|
#define OMAP3430_CLKACTIVITY_L3_SHIFT 0
|
|
|
|
#define OMAP3430_CLKACTIVITY_L3_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_FCLKEN_GFX */
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430ES1_EN_3D_MASK (1 << 2)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430ES1_EN_3D_SHIFT 2
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430ES1_EN_2D_MASK (1 << 1)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430ES1_EN_2D_SHIFT 1
|
|
|
|
|
|
|
|
/* CM_ICLKEN_GFX specific bits */
|
|
|
|
|
|
|
|
/* CM_IDLEST_GFX specific bits */
|
|
|
|
|
|
|
|
/* CM_CLKSEL_GFX specific bits */
|
|
|
|
|
|
|
|
/* CM_SLEEPDEP_GFX specific bits */
|
|
|
|
|
|
|
|
/* CM_CLKSTCTRL_GFX */
|
|
|
|
#define OMAP3430ES1_CLKTRCTRL_GFX_SHIFT 0
|
|
|
|
#define OMAP3430ES1_CLKTRCTRL_GFX_MASK (0x3 << 0)
|
|
|
|
|
|
|
|
/* CM_CLKSTST_GFX */
|
2008-08-19 15:08:44 +07:00
|
|
|
#define OMAP3430ES1_CLKACTIVITY_GFX_SHIFT 0
|
|
|
|
#define OMAP3430ES1_CLKACTIVITY_GFX_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_FCLKEN_SGX */
|
2009-01-28 09:13:05 +07:00
|
|
|
#define OMAP3430ES2_CM_FCLKEN_SGX_EN_SGX_SHIFT 1
|
|
|
|
#define OMAP3430ES2_CM_FCLKEN_SGX_EN_SGX_MASK (1 << 1)
|
|
|
|
|
2010-02-25 02:05:48 +07:00
|
|
|
/* CM_IDLEST_SGX */
|
|
|
|
#define OMAP3430ES2_ST_SGX_SHIFT 1
|
|
|
|
#define OMAP3430ES2_ST_SGX_MASK (1 << 1)
|
|
|
|
|
2009-01-28 09:13:05 +07:00
|
|
|
/* CM_ICLKEN_SGX */
|
|
|
|
#define OMAP3430ES2_CM_ICLKEN_SGX_EN_SGX_SHIFT 0
|
|
|
|
#define OMAP3430ES2_CM_ICLKEN_SGX_EN_SGX_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_CLKSEL_SGX */
|
|
|
|
#define OMAP3430ES2_CLKSEL_SGX_SHIFT 0
|
|
|
|
#define OMAP3430ES2_CLKSEL_SGX_MASK (0x7 << 0)
|
|
|
|
|
2008-08-19 15:08:44 +07:00
|
|
|
/* CM_CLKSTCTRL_SGX */
|
|
|
|
#define OMAP3430ES2_CLKTRCTRL_SGX_SHIFT 0
|
|
|
|
#define OMAP3430ES2_CLKTRCTRL_SGX_MASK (0x3 << 0)
|
|
|
|
|
|
|
|
/* CM_CLKSTST_SGX */
|
|
|
|
#define OMAP3430ES2_CLKACTIVITY_SGX_SHIFT 0
|
|
|
|
#define OMAP3430ES2_CLKACTIVITY_SGX_MASK (1 << 0)
|
|
|
|
|
2008-03-18 19:53:17 +07:00
|
|
|
/* CM_FCLKEN_WKUP specific bits */
|
|
|
|
#define OMAP3430ES2_EN_USIMOCP_SHIFT 9
|
[ARM] OMAP2 PRCM: clean up CM_IDLEST bits
This patch fixes a few OMAP2xxx CM_IDLEST bits that were incorrectly
marked as being OMAP2xxx-wide, when they were actually 2420-specific.
Also, originally when the PRCM register macros were defined, bit shift
macros used a "_SHIFT" suffix, and mask macros used none. This became
a source of bugs and confusion, as the mask macros were mistakenly
used for shift values. Gradually, the mask macros have been updated,
piece by piece, to add a "_MASK" suffix on the end to clarify. This
patch applies this change to the CM_IDLEST_* register bits.
The patch also adds a few bits that were missing, mostly from the 3430ES1
to ES2 revisions.
linux-omap source commits are d18eff5b5fa15e170794397a6a94486d1f774f77,
e1f1a5cc24615fb790cc763c96d1c5cfe6296f5b, and part of
9fe6b6cf8d9e0cbb429fd64553a4b3160a9e99e1
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-01-29 02:18:22 +07:00
|
|
|
#define OMAP3430ES2_EN_USIMOCP_MASK (1 << 9)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_ICLKEN_WKUP specific bits */
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_WDT1_MASK (1 << 4)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_EN_WDT1_SHIFT 4
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_32KSYNC_MASK (1 << 2)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_EN_32KSYNC_SHIFT 2
|
|
|
|
|
|
|
|
/* CM_IDLEST_WKUP specific bits */
|
[ARM] OMAP2 PRCM: clean up CM_IDLEST bits
This patch fixes a few OMAP2xxx CM_IDLEST bits that were incorrectly
marked as being OMAP2xxx-wide, when they were actually 2420-specific.
Also, originally when the PRCM register macros were defined, bit shift
macros used a "_SHIFT" suffix, and mask macros used none. This became
a source of bugs and confusion, as the mask macros were mistakenly
used for shift values. Gradually, the mask macros have been updated,
piece by piece, to add a "_MASK" suffix on the end to clarify. This
patch applies this change to the CM_IDLEST_* register bits.
The patch also adds a few bits that were missing, mostly from the 3430ES1
to ES2 revisions.
linux-omap source commits are d18eff5b5fa15e170794397a6a94486d1f774f77,
e1f1a5cc24615fb790cc763c96d1c5cfe6296f5b, and part of
9fe6b6cf8d9e0cbb429fd64553a4b3160a9e99e1
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-01-29 02:18:22 +07:00
|
|
|
#define OMAP3430ES2_ST_USIMOCP_SHIFT 9
|
|
|
|
#define OMAP3430ES2_ST_USIMOCP_MASK (1 << 9)
|
|
|
|
#define OMAP3430_ST_WDT2_SHIFT 5
|
|
|
|
#define OMAP3430_ST_WDT2_MASK (1 << 5)
|
|
|
|
#define OMAP3430_ST_WDT1_SHIFT 4
|
|
|
|
#define OMAP3430_ST_WDT1_MASK (1 << 4)
|
|
|
|
#define OMAP3430_ST_32KSYNC_SHIFT 2
|
|
|
|
#define OMAP3430_ST_32KSYNC_MASK (1 << 2)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_AUTOIDLE_WKUP */
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430ES2_AUTO_USIMOCP_MASK (1 << 9)
|
[ARM] OMAP2 PRCM: clean up CM_IDLEST bits
This patch fixes a few OMAP2xxx CM_IDLEST bits that were incorrectly
marked as being OMAP2xxx-wide, when they were actually 2420-specific.
Also, originally when the PRCM register macros were defined, bit shift
macros used a "_SHIFT" suffix, and mask macros used none. This became
a source of bugs and confusion, as the mask macros were mistakenly
used for shift values. Gradually, the mask macros have been updated,
piece by piece, to add a "_MASK" suffix on the end to clarify. This
patch applies this change to the CM_IDLEST_* register bits.
The patch also adds a few bits that were missing, mostly from the 3430ES1
to ES2 revisions.
linux-omap source commits are d18eff5b5fa15e170794397a6a94486d1f774f77,
e1f1a5cc24615fb790cc763c96d1c5cfe6296f5b, and part of
9fe6b6cf8d9e0cbb429fd64553a4b3160a9e99e1
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-01-29 02:18:22 +07:00
|
|
|
#define OMAP3430ES2_AUTO_USIMOCP_SHIFT 9
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_WDT2_MASK (1 << 5)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_WDT2_SHIFT 5
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_WDT1_MASK (1 << 4)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_WDT1_SHIFT 4
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_GPIO1_MASK (1 << 3)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_GPIO1_SHIFT 3
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_32KSYNC_MASK (1 << 2)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_32KSYNC_SHIFT 2
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_GPT12_MASK (1 << 1)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_GPT12_SHIFT 1
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_GPT1_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_GPT1_SHIFT 0
|
|
|
|
|
|
|
|
/* CM_CLKSEL_WKUP */
|
|
|
|
#define OMAP3430ES2_CLKSEL_USIMOCP_MASK (0xf << 3)
|
|
|
|
#define OMAP3430_CLKSEL_RM_SHIFT 1
|
|
|
|
#define OMAP3430_CLKSEL_RM_MASK (0x3 << 1)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430_CLKSEL_RM_WIDTH 2
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_CLKSEL_GPT1_SHIFT 0
|
|
|
|
#define OMAP3430_CLKSEL_GPT1_MASK (1 << 0)
|
|
|
|
|
|
|
|
/* CM_CLKEN_PLL */
|
|
|
|
#define OMAP3430_PWRDN_EMU_PERIPH_SHIFT 31
|
|
|
|
#define OMAP3430_PWRDN_CAM_SHIFT 30
|
|
|
|
#define OMAP3430_PWRDN_DSS1_SHIFT 29
|
|
|
|
#define OMAP3430_PWRDN_TV_SHIFT 28
|
|
|
|
#define OMAP3430_PWRDN_96M_SHIFT 27
|
|
|
|
#define OMAP3430_PERIPH_DPLL_RAMPTIME_SHIFT 24
|
|
|
|
#define OMAP3430_PERIPH_DPLL_RAMPTIME_MASK (0x3 << 24)
|
|
|
|
#define OMAP3430_PERIPH_DPLL_FREQSEL_SHIFT 20
|
|
|
|
#define OMAP3430_PERIPH_DPLL_FREQSEL_MASK (0xf << 20)
|
|
|
|
#define OMAP3430_EN_PERIPH_DPLL_DRIFTGUARD_SHIFT 19
|
|
|
|
#define OMAP3430_EN_PERIPH_DPLL_DRIFTGUARD_MASK (1 << 19)
|
|
|
|
#define OMAP3430_EN_PERIPH_DPLL_SHIFT 16
|
|
|
|
#define OMAP3430_EN_PERIPH_DPLL_MASK (0x7 << 16)
|
|
|
|
#define OMAP3430_PWRDN_EMU_CORE_SHIFT 12
|
|
|
|
#define OMAP3430_CORE_DPLL_RAMPTIME_SHIFT 8
|
|
|
|
#define OMAP3430_CORE_DPLL_RAMPTIME_MASK (0x3 << 8)
|
|
|
|
#define OMAP3430_CORE_DPLL_FREQSEL_SHIFT 4
|
|
|
|
#define OMAP3430_CORE_DPLL_FREQSEL_MASK (0xf << 4)
|
|
|
|
#define OMAP3430_EN_CORE_DPLL_DRIFTGUARD_SHIFT 3
|
|
|
|
#define OMAP3430_EN_CORE_DPLL_DRIFTGUARD_MASK (1 << 3)
|
|
|
|
#define OMAP3430_EN_CORE_DPLL_SHIFT 0
|
|
|
|
#define OMAP3430_EN_CORE_DPLL_MASK (0x7 << 0)
|
|
|
|
|
|
|
|
/* CM_CLKEN2_PLL */
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430ES2_EN_PERIPH2_DPLL_LPMODE_SHIFT 10
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430ES2_PERIPH2_DPLL_RAMPTIME_MASK (0x3 << 8)
|
|
|
|
#define OMAP3430ES2_PERIPH2_DPLL_FREQSEL_SHIFT 4
|
|
|
|
#define OMAP3430ES2_PERIPH2_DPLL_FREQSEL_MASK (0xf << 4)
|
|
|
|
#define OMAP3430ES2_EN_PERIPH2_DPLL_DRIFTGUARD_SHIFT 3
|
|
|
|
#define OMAP3430ES2_EN_PERIPH2_DPLL_SHIFT 0
|
|
|
|
#define OMAP3430ES2_EN_PERIPH2_DPLL_MASK (0x7 << 0)
|
|
|
|
|
|
|
|
/* CM_IDLEST_CKGEN */
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_ST_54M_CLK_MASK (1 << 5)
|
|
|
|
#define OMAP3430_ST_12M_CLK_MASK (1 << 4)
|
|
|
|
#define OMAP3430_ST_48M_CLK_MASK (1 << 3)
|
|
|
|
#define OMAP3430_ST_96M_CLK_MASK (1 << 2)
|
2008-07-03 16:24:45 +07:00
|
|
|
#define OMAP3430_ST_PERIPH_CLK_SHIFT 1
|
|
|
|
#define OMAP3430_ST_PERIPH_CLK_MASK (1 << 1)
|
|
|
|
#define OMAP3430_ST_CORE_CLK_SHIFT 0
|
|
|
|
#define OMAP3430_ST_CORE_CLK_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_IDLEST2_CKGEN */
|
[ARM] OMAP2 PRCM: clean up CM_IDLEST bits
This patch fixes a few OMAP2xxx CM_IDLEST bits that were incorrectly
marked as being OMAP2xxx-wide, when they were actually 2420-specific.
Also, originally when the PRCM register macros were defined, bit shift
macros used a "_SHIFT" suffix, and mask macros used none. This became
a source of bugs and confusion, as the mask macros were mistakenly
used for shift values. Gradually, the mask macros have been updated,
piece by piece, to add a "_MASK" suffix on the end to clarify. This
patch applies this change to the CM_IDLEST_* register bits.
The patch also adds a few bits that were missing, mostly from the 3430ES1
to ES2 revisions.
linux-omap source commits are d18eff5b5fa15e170794397a6a94486d1f774f77,
e1f1a5cc24615fb790cc763c96d1c5cfe6296f5b, and part of
9fe6b6cf8d9e0cbb429fd64553a4b3160a9e99e1
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-01-29 02:18:22 +07:00
|
|
|
#define OMAP3430ES2_ST_USIM_CLK_SHIFT 2
|
|
|
|
#define OMAP3430ES2_ST_USIM_CLK_MASK (1 << 2)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430ES2_ST_120M_CLK_SHIFT 1
|
|
|
|
#define OMAP3430ES2_ST_120M_CLK_MASK (1 << 1)
|
|
|
|
#define OMAP3430ES2_ST_PERIPH2_CLK_SHIFT 0
|
|
|
|
#define OMAP3430ES2_ST_PERIPH2_CLK_MASK (1 << 0)
|
|
|
|
|
|
|
|
/* CM_AUTOIDLE_PLL */
|
|
|
|
#define OMAP3430_AUTO_PERIPH_DPLL_SHIFT 3
|
|
|
|
#define OMAP3430_AUTO_PERIPH_DPLL_MASK (0x7 << 3)
|
|
|
|
#define OMAP3430_AUTO_CORE_DPLL_SHIFT 0
|
|
|
|
#define OMAP3430_AUTO_CORE_DPLL_MASK (0x7 << 0)
|
|
|
|
|
2008-07-03 16:24:45 +07:00
|
|
|
/* CM_AUTOIDLE2_PLL */
|
|
|
|
#define OMAP3430ES2_AUTO_PERIPH2_DPLL_SHIFT 0
|
|
|
|
#define OMAP3430ES2_AUTO_PERIPH2_DPLL_MASK (0x7 << 0)
|
|
|
|
|
2008-03-18 19:53:17 +07:00
|
|
|
/* CM_CLKSEL1_PLL */
|
|
|
|
/* Note that OMAP3430_CORE_DPLL_CLKOUT_DIV_MASK was (0x3 << 27) on 3430ES1 */
|
|
|
|
#define OMAP3430_CORE_DPLL_CLKOUT_DIV_SHIFT 27
|
|
|
|
#define OMAP3430_CORE_DPLL_CLKOUT_DIV_MASK (0x1f << 27)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430_CORE_DPLL_CLKOUT_DIV_WIDTH 5
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_CORE_DPLL_MULT_SHIFT 16
|
|
|
|
#define OMAP3430_CORE_DPLL_MULT_MASK (0x7ff << 16)
|
|
|
|
#define OMAP3430_CORE_DPLL_DIV_SHIFT 8
|
|
|
|
#define OMAP3430_CORE_DPLL_DIV_MASK (0x7f << 8)
|
2009-01-28 09:13:02 +07:00
|
|
|
#define OMAP3430_SOURCE_96M_SHIFT 6
|
|
|
|
#define OMAP3430_SOURCE_96M_MASK (1 << 6)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430_SOURCE_96M_WIDTH 1
|
2009-01-28 09:13:02 +07:00
|
|
|
#define OMAP3430_SOURCE_54M_SHIFT 5
|
|
|
|
#define OMAP3430_SOURCE_54M_MASK (1 << 5)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430_SOURCE_54M_WIDTH 1
|
2009-01-28 09:13:02 +07:00
|
|
|
#define OMAP3430_SOURCE_48M_SHIFT 3
|
|
|
|
#define OMAP3430_SOURCE_48M_MASK (1 << 3)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_CLKSEL2_PLL */
|
|
|
|
#define OMAP3430_PERIPH_DPLL_MULT_SHIFT 8
|
|
|
|
#define OMAP3430_PERIPH_DPLL_MULT_MASK (0x7ff << 8)
|
2010-02-23 12:09:08 +07:00
|
|
|
#define OMAP3630_PERIPH_DPLL_MULT_MASK (0xfff << 8)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_PERIPH_DPLL_DIV_SHIFT 0
|
|
|
|
#define OMAP3430_PERIPH_DPLL_DIV_MASK (0x7f << 0)
|
2010-02-23 12:09:08 +07:00
|
|
|
#define OMAP3630_PERIPH_DPLL_DCO_SEL_SHIFT 21
|
|
|
|
#define OMAP3630_PERIPH_DPLL_DCO_SEL_MASK (0x7 << 21)
|
|
|
|
#define OMAP3630_PERIPH_DPLL_SD_DIV_SHIFT 24
|
|
|
|
#define OMAP3630_PERIPH_DPLL_SD_DIV_MASK (0xff << 24)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_CLKSEL3_PLL */
|
|
|
|
#define OMAP3430_DIV_96M_SHIFT 0
|
|
|
|
#define OMAP3430_DIV_96M_MASK (0x1f << 0)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430_DIV_96M_WIDTH 5
|
2010-02-23 12:09:09 +07:00
|
|
|
#define OMAP3630_DIV_96M_MASK (0x3f << 0)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3630_DIV_96M_WIDTH 6
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_CLKSEL4_PLL */
|
|
|
|
#define OMAP3430ES2_PERIPH2_DPLL_MULT_SHIFT 8
|
|
|
|
#define OMAP3430ES2_PERIPH2_DPLL_MULT_MASK (0x7ff << 8)
|
|
|
|
#define OMAP3430ES2_PERIPH2_DPLL_DIV_SHIFT 0
|
|
|
|
#define OMAP3430ES2_PERIPH2_DPLL_DIV_MASK (0x7f << 0)
|
|
|
|
|
|
|
|
/* CM_CLKSEL5_PLL */
|
|
|
|
#define OMAP3430ES2_DIV_120M_SHIFT 0
|
|
|
|
#define OMAP3430ES2_DIV_120M_MASK (0x1f << 0)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430ES2_DIV_120M_WIDTH 5
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_CLKOUT_CTRL */
|
|
|
|
#define OMAP3430_CLKOUT2_EN_SHIFT 7
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_CLKOUT2_EN_MASK (1 << 7)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_CLKOUT2_DIV_SHIFT 3
|
|
|
|
#define OMAP3430_CLKOUT2_DIV_MASK (0x7 << 3)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430_CLKOUT2_DIV_WIDTH 3
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_CLKOUT2SOURCE_SHIFT 0
|
|
|
|
#define OMAP3430_CLKOUT2SOURCE_MASK (0x3 << 0)
|
|
|
|
|
|
|
|
/* CM_FCLKEN_DSS */
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_TV_MASK (1 << 2)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_EN_TV_SHIFT 2
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_DSS2_MASK (1 << 1)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_EN_DSS2_SHIFT 1
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_DSS1_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_EN_DSS1_SHIFT 0
|
|
|
|
|
|
|
|
/* CM_ICLKEN_DSS */
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_CM_ICLKEN_DSS_EN_DSS_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_CM_ICLKEN_DSS_EN_DSS_SHIFT 0
|
|
|
|
|
|
|
|
/* CM_IDLEST_DSS */
|
[ARM] OMAP2 PRCM: clean up CM_IDLEST bits
This patch fixes a few OMAP2xxx CM_IDLEST bits that were incorrectly
marked as being OMAP2xxx-wide, when they were actually 2420-specific.
Also, originally when the PRCM register macros were defined, bit shift
macros used a "_SHIFT" suffix, and mask macros used none. This became
a source of bugs and confusion, as the mask macros were mistakenly
used for shift values. Gradually, the mask macros have been updated,
piece by piece, to add a "_MASK" suffix on the end to clarify. This
patch applies this change to the CM_IDLEST_* register bits.
The patch also adds a few bits that were missing, mostly from the 3430ES1
to ES2 revisions.
linux-omap source commits are d18eff5b5fa15e170794397a6a94486d1f774f77,
e1f1a5cc24615fb790cc763c96d1c5cfe6296f5b, and part of
9fe6b6cf8d9e0cbb429fd64553a4b3160a9e99e1
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-01-29 02:18:22 +07:00
|
|
|
#define OMAP3430ES2_ST_DSS_IDLE_SHIFT 1
|
|
|
|
#define OMAP3430ES2_ST_DSS_IDLE_MASK (1 << 1)
|
|
|
|
#define OMAP3430ES2_ST_DSS_STDBY_SHIFT 0
|
|
|
|
#define OMAP3430ES2_ST_DSS_STDBY_MASK (1 << 0)
|
|
|
|
#define OMAP3430ES1_ST_DSS_SHIFT 0
|
|
|
|
#define OMAP3430ES1_ST_DSS_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_AUTOIDLE_DSS */
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_DSS_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_DSS_SHIFT 0
|
|
|
|
|
|
|
|
/* CM_CLKSEL_DSS */
|
|
|
|
#define OMAP3430_CLKSEL_TV_SHIFT 8
|
|
|
|
#define OMAP3430_CLKSEL_TV_MASK (0x1f << 8)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430_CLKSEL_TV_WIDTH 5
|
2010-02-23 12:09:09 +07:00
|
|
|
#define OMAP3630_CLKSEL_TV_MASK (0x3f << 8)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3630_CLKSEL_TV_WIDTH 6
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_CLKSEL_DSS1_SHIFT 0
|
|
|
|
#define OMAP3430_CLKSEL_DSS1_MASK (0x1f << 0)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430_CLKSEL_DSS1_WIDTH 5
|
2010-02-23 12:09:09 +07:00
|
|
|
#define OMAP3630_CLKSEL_DSS1_MASK (0x3f << 0)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3630_CLKSEL_DSS1_WIDTH 6
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_SLEEPDEP_DSS specific bits */
|
|
|
|
|
|
|
|
/* CM_CLKSTCTRL_DSS */
|
|
|
|
#define OMAP3430_CLKTRCTRL_DSS_SHIFT 0
|
|
|
|
#define OMAP3430_CLKTRCTRL_DSS_MASK (0x3 << 0)
|
|
|
|
|
|
|
|
/* CM_CLKSTST_DSS */
|
2008-08-19 15:08:44 +07:00
|
|
|
#define OMAP3430_CLKACTIVITY_DSS_SHIFT 0
|
|
|
|
#define OMAP3430_CLKACTIVITY_DSS_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_FCLKEN_CAM specific bits */
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_EN_CSI2_MASK (1 << 1)
|
2009-01-28 09:13:09 +07:00
|
|
|
#define OMAP3430_EN_CSI2_SHIFT 1
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_ICLKEN_CAM specific bits */
|
|
|
|
|
|
|
|
/* CM_IDLEST_CAM */
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_ST_CAM_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_AUTOIDLE_CAM */
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_CAM_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_CAM_SHIFT 0
|
|
|
|
|
|
|
|
/* CM_CLKSEL_CAM */
|
|
|
|
#define OMAP3430_CLKSEL_CAM_SHIFT 0
|
|
|
|
#define OMAP3430_CLKSEL_CAM_MASK (0x1f << 0)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430_CLKSEL_CAM_WIDTH 5
|
2010-02-23 12:09:09 +07:00
|
|
|
#define OMAP3630_CLKSEL_CAM_MASK (0x3f << 0)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3630_CLKSEL_CAM_WIDTH 6
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_SLEEPDEP_CAM specific bits */
|
|
|
|
|
|
|
|
/* CM_CLKSTCTRL_CAM */
|
|
|
|
#define OMAP3430_CLKTRCTRL_CAM_SHIFT 0
|
|
|
|
#define OMAP3430_CLKTRCTRL_CAM_MASK (0x3 << 0)
|
|
|
|
|
|
|
|
/* CM_CLKSTST_CAM */
|
2008-08-19 15:08:44 +07:00
|
|
|
#define OMAP3430_CLKACTIVITY_CAM_SHIFT 0
|
|
|
|
#define OMAP3430_CLKACTIVITY_CAM_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_FCLKEN_PER specific bits */
|
|
|
|
|
|
|
|
/* CM_ICLKEN_PER specific bits */
|
|
|
|
|
|
|
|
/* CM_IDLEST_PER */
|
[ARM] OMAP2 PRCM: clean up CM_IDLEST bits
This patch fixes a few OMAP2xxx CM_IDLEST bits that were incorrectly
marked as being OMAP2xxx-wide, when they were actually 2420-specific.
Also, originally when the PRCM register macros were defined, bit shift
macros used a "_SHIFT" suffix, and mask macros used none. This became
a source of bugs and confusion, as the mask macros were mistakenly
used for shift values. Gradually, the mask macros have been updated,
piece by piece, to add a "_MASK" suffix on the end to clarify. This
patch applies this change to the CM_IDLEST_* register bits.
The patch also adds a few bits that were missing, mostly from the 3430ES1
to ES2 revisions.
linux-omap source commits are d18eff5b5fa15e170794397a6a94486d1f774f77,
e1f1a5cc24615fb790cc763c96d1c5cfe6296f5b, and part of
9fe6b6cf8d9e0cbb429fd64553a4b3160a9e99e1
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-01-29 02:18:22 +07:00
|
|
|
#define OMAP3430_ST_WDT3_SHIFT 12
|
|
|
|
#define OMAP3430_ST_WDT3_MASK (1 << 12)
|
|
|
|
#define OMAP3430_ST_MCBSP4_SHIFT 2
|
|
|
|
#define OMAP3430_ST_MCBSP4_MASK (1 << 2)
|
|
|
|
#define OMAP3430_ST_MCBSP3_SHIFT 1
|
|
|
|
#define OMAP3430_ST_MCBSP3_MASK (1 << 1)
|
|
|
|
#define OMAP3430_ST_MCBSP2_SHIFT 0
|
|
|
|
#define OMAP3430_ST_MCBSP2_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_AUTOIDLE_PER */
|
2010-09-27 21:50:25 +07:00
|
|
|
#define OMAP3630_AUTO_UART4_MASK (1 << 18)
|
|
|
|
#define OMAP3630_AUTO_UART4_SHIFT 18
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_GPIO6_MASK (1 << 17)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_GPIO6_SHIFT 17
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_GPIO5_MASK (1 << 16)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_GPIO5_SHIFT 16
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_GPIO4_MASK (1 << 15)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_GPIO4_SHIFT 15
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_GPIO3_MASK (1 << 14)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_GPIO3_SHIFT 14
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_GPIO2_MASK (1 << 13)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_GPIO2_SHIFT 13
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_WDT3_MASK (1 << 12)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_WDT3_SHIFT 12
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_UART3_MASK (1 << 11)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_UART3_SHIFT 11
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_GPT9_MASK (1 << 10)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_GPT9_SHIFT 10
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_GPT8_MASK (1 << 9)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_GPT8_SHIFT 9
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_GPT7_MASK (1 << 8)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_GPT7_SHIFT 8
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_GPT6_MASK (1 << 7)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_GPT6_SHIFT 7
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_GPT5_MASK (1 << 6)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_GPT5_SHIFT 6
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_GPT4_MASK (1 << 5)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_GPT4_SHIFT 5
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_GPT3_MASK (1 << 4)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_GPT3_SHIFT 4
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_GPT2_MASK (1 << 3)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_GPT2_SHIFT 3
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_MCBSP4_MASK (1 << 2)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_MCBSP4_SHIFT 2
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_MCBSP3_MASK (1 << 1)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_MCBSP3_SHIFT 1
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_AUTO_MCBSP2_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_AUTO_MCBSP2_SHIFT 0
|
|
|
|
|
|
|
|
/* CM_CLKSEL_PER */
|
|
|
|
#define OMAP3430_CLKSEL_GPT9_MASK (1 << 7)
|
|
|
|
#define OMAP3430_CLKSEL_GPT9_SHIFT 7
|
|
|
|
#define OMAP3430_CLKSEL_GPT8_MASK (1 << 6)
|
|
|
|
#define OMAP3430_CLKSEL_GPT8_SHIFT 6
|
|
|
|
#define OMAP3430_CLKSEL_GPT7_MASK (1 << 5)
|
|
|
|
#define OMAP3430_CLKSEL_GPT7_SHIFT 5
|
|
|
|
#define OMAP3430_CLKSEL_GPT6_MASK (1 << 4)
|
|
|
|
#define OMAP3430_CLKSEL_GPT6_SHIFT 4
|
|
|
|
#define OMAP3430_CLKSEL_GPT5_MASK (1 << 3)
|
|
|
|
#define OMAP3430_CLKSEL_GPT5_SHIFT 3
|
|
|
|
#define OMAP3430_CLKSEL_GPT4_MASK (1 << 2)
|
|
|
|
#define OMAP3430_CLKSEL_GPT4_SHIFT 2
|
|
|
|
#define OMAP3430_CLKSEL_GPT3_MASK (1 << 1)
|
|
|
|
#define OMAP3430_CLKSEL_GPT3_SHIFT 1
|
|
|
|
#define OMAP3430_CLKSEL_GPT2_MASK (1 << 0)
|
|
|
|
#define OMAP3430_CLKSEL_GPT2_SHIFT 0
|
|
|
|
|
|
|
|
/* CM_SLEEPDEP_PER specific bits */
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_CM_SLEEPDEP_PER_EN_IVA2_MASK (1 << 2)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_CLKSTCTRL_PER */
|
|
|
|
#define OMAP3430_CLKTRCTRL_PER_SHIFT 0
|
|
|
|
#define OMAP3430_CLKTRCTRL_PER_MASK (0x3 << 0)
|
|
|
|
|
|
|
|
/* CM_CLKSTST_PER */
|
2008-08-19 15:08:44 +07:00
|
|
|
#define OMAP3430_CLKACTIVITY_PER_SHIFT 0
|
|
|
|
#define OMAP3430_CLKACTIVITY_PER_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_CLKSEL1_EMU */
|
|
|
|
#define OMAP3430_DIV_DPLL4_SHIFT 24
|
|
|
|
#define OMAP3430_DIV_DPLL4_MASK (0x1f << 24)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430_DIV_DPLL4_WIDTH 5
|
2010-02-23 12:09:09 +07:00
|
|
|
#define OMAP3630_DIV_DPLL4_MASK (0x3f << 24)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3630_DIV_DPLL4_WIDTH 6
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_DIV_DPLL3_SHIFT 16
|
|
|
|
#define OMAP3430_DIV_DPLL3_MASK (0x1f << 16)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430_DIV_DPLL3_WIDTH 5
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_CLKSEL_TRACECLK_SHIFT 11
|
|
|
|
#define OMAP3430_CLKSEL_TRACECLK_MASK (0x7 << 11)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430_CLKSEL_TRACECLK_WIDTH 3
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_CLKSEL_PCLK_SHIFT 8
|
|
|
|
#define OMAP3430_CLKSEL_PCLK_MASK (0x7 << 8)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430_CLKSEL_PCLK_WIDTH 3
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_CLKSEL_PCLKX2_SHIFT 6
|
|
|
|
#define OMAP3430_CLKSEL_PCLKX2_MASK (0x3 << 6)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430_CLKSEL_PCLKX2_WIDTH 2
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_CLKSEL_ATCLK_SHIFT 4
|
|
|
|
#define OMAP3430_CLKSEL_ATCLK_MASK (0x3 << 4)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430_CLKSEL_ATCLK_WIDTH 2
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_TRACE_MUX_CTRL_SHIFT 2
|
|
|
|
#define OMAP3430_TRACE_MUX_CTRL_MASK (0x3 << 2)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430_TRACE_MUX_CTRL_WIDTH 2
|
2008-03-18 19:53:17 +07:00
|
|
|
#define OMAP3430_MUX_CTRL_SHIFT 0
|
|
|
|
#define OMAP3430_MUX_CTRL_MASK (0x3 << 0)
|
2012-11-02 18:02:58 +07:00
|
|
|
#define OMAP3430_MUX_CTRL_WIDTH 2
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_CLKSTCTRL_EMU */
|
|
|
|
#define OMAP3430_CLKTRCTRL_EMU_SHIFT 0
|
|
|
|
#define OMAP3430_CLKTRCTRL_EMU_MASK (0x3 << 0)
|
|
|
|
|
|
|
|
/* CM_CLKSTST_EMU */
|
2008-08-19 15:08:44 +07:00
|
|
|
#define OMAP3430_CLKACTIVITY_EMU_SHIFT 0
|
|
|
|
#define OMAP3430_CLKACTIVITY_EMU_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_CLKSEL2_EMU specific bits */
|
|
|
|
#define OMAP3430_CORE_DPLL_EMU_MULT_SHIFT 8
|
|
|
|
#define OMAP3430_CORE_DPLL_EMU_MULT_MASK (0x7ff << 8)
|
|
|
|
#define OMAP3430_CORE_DPLL_EMU_DIV_SHIFT 0
|
|
|
|
#define OMAP3430_CORE_DPLL_EMU_DIV_MASK (0x7f << 0)
|
|
|
|
|
|
|
|
/* CM_CLKSEL3_EMU specific bits */
|
|
|
|
#define OMAP3430_PERIPH_DPLL_EMU_MULT_SHIFT 8
|
|
|
|
#define OMAP3430_PERIPH_DPLL_EMU_MULT_MASK (0x7ff << 8)
|
|
|
|
#define OMAP3430_PERIPH_DPLL_EMU_DIV_SHIFT 0
|
|
|
|
#define OMAP3430_PERIPH_DPLL_EMU_DIV_MASK (0x7f << 0)
|
|
|
|
|
|
|
|
/* CM_POLCTRL */
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_CLKOUT2_POL_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_IDLEST_NEON */
|
2010-05-19 07:47:24 +07:00
|
|
|
#define OMAP3430_ST_NEON_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_CLKSTCTRL_NEON */
|
|
|
|
#define OMAP3430_CLKTRCTRL_NEON_SHIFT 0
|
|
|
|
#define OMAP3430_CLKTRCTRL_NEON_MASK (0x3 << 0)
|
|
|
|
|
|
|
|
/* CM_FCLKEN_USBHOST */
|
|
|
|
#define OMAP3430ES2_EN_USBHOST2_SHIFT 1
|
|
|
|
#define OMAP3430ES2_EN_USBHOST2_MASK (1 << 1)
|
|
|
|
#define OMAP3430ES2_EN_USBHOST1_SHIFT 0
|
|
|
|
#define OMAP3430ES2_EN_USBHOST1_MASK (1 << 0)
|
|
|
|
|
|
|
|
/* CM_ICLKEN_USBHOST */
|
|
|
|
#define OMAP3430ES2_EN_USBHOST_SHIFT 0
|
|
|
|
#define OMAP3430ES2_EN_USBHOST_MASK (1 << 0)
|
|
|
|
|
|
|
|
/* CM_IDLEST_USBHOST */
|
[ARM] OMAP2 PRCM: clean up CM_IDLEST bits
This patch fixes a few OMAP2xxx CM_IDLEST bits that were incorrectly
marked as being OMAP2xxx-wide, when they were actually 2420-specific.
Also, originally when the PRCM register macros were defined, bit shift
macros used a "_SHIFT" suffix, and mask macros used none. This became
a source of bugs and confusion, as the mask macros were mistakenly
used for shift values. Gradually, the mask macros have been updated,
piece by piece, to add a "_MASK" suffix on the end to clarify. This
patch applies this change to the CM_IDLEST_* register bits.
The patch also adds a few bits that were missing, mostly from the 3430ES1
to ES2 revisions.
linux-omap source commits are d18eff5b5fa15e170794397a6a94486d1f774f77,
e1f1a5cc24615fb790cc763c96d1c5cfe6296f5b, and part of
9fe6b6cf8d9e0cbb429fd64553a4b3160a9e99e1
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-01-29 02:18:22 +07:00
|
|
|
#define OMAP3430ES2_ST_USBHOST_IDLE_SHIFT 1
|
|
|
|
#define OMAP3430ES2_ST_USBHOST_IDLE_MASK (1 << 1)
|
|
|
|
#define OMAP3430ES2_ST_USBHOST_STDBY_SHIFT 0
|
|
|
|
#define OMAP3430ES2_ST_USBHOST_STDBY_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
|
|
|
/* CM_AUTOIDLE_USBHOST */
|
|
|
|
#define OMAP3430ES2_AUTO_USBHOST_SHIFT 0
|
|
|
|
#define OMAP3430ES2_AUTO_USBHOST_MASK (1 << 0)
|
|
|
|
|
|
|
|
/* CM_SLEEPDEP_USBHOST */
|
|
|
|
#define OMAP3430ES2_EN_MPU_SHIFT 1
|
|
|
|
#define OMAP3430ES2_EN_MPU_MASK (1 << 1)
|
|
|
|
#define OMAP3430ES2_EN_IVA2_SHIFT 2
|
|
|
|
#define OMAP3430ES2_EN_IVA2_MASK (1 << 2)
|
|
|
|
|
|
|
|
/* CM_CLKSTCTRL_USBHOST */
|
|
|
|
#define OMAP3430ES2_CLKTRCTRL_USBHOST_SHIFT 0
|
|
|
|
#define OMAP3430ES2_CLKTRCTRL_USBHOST_MASK (3 << 0)
|
|
|
|
|
2008-08-19 15:08:44 +07:00
|
|
|
/* CM_CLKSTST_USBHOST */
|
|
|
|
#define OMAP3430ES2_CLKACTIVITY_USBHOST_SHIFT 0
|
|
|
|
#define OMAP3430ES2_CLKACTIVITY_USBHOST_MASK (1 << 0)
|
2008-03-18 19:53:17 +07:00
|
|
|
|
2010-12-22 11:05:15 +07:00
|
|
|
/*
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* OMAP3XXX CM_CLKSTCTRL_*.CLKTRCTRL_* register bit values */
|
|
|
|
#define OMAP34XX_CLKSTCTRL_DISABLE_AUTO 0x0
|
|
|
|
#define OMAP34XX_CLKSTCTRL_FORCE_SLEEP 0x1
|
|
|
|
#define OMAP34XX_CLKSTCTRL_FORCE_WAKEUP 0x2
|
|
|
|
#define OMAP34XX_CLKSTCTRL_ENABLE_AUTO 0x3
|
|
|
|
|
|
|
|
|
2008-03-18 19:53:17 +07:00
|
|
|
#endif
|