msm: ocmem: Add a separate Kconfig for keeping clocks enabled.

For bringup purposes add a new Kconfig item that performs
the extra vote for the ocmem core clock and thus forcing the
core to remain turned ON at all times.

The previously used Kconfig MSM_OCMEM_POWER_DISABLE for the
same purpose now skips all power operations including clock votes.

Change-Id: I3068dcb84b8caaa900243f5bdffef36c88ff4e5c
Signed-off-by: Naveen Ramaraj <nramaraj@codeaurora.org>
This commit is contained in:
Naveen Ramaraj 2013-03-11 13:56:06 -07:00 committed by Stephen Boyd
parent 9fe18daa53
commit 5daf7da86a
2 changed files with 24 additions and 12 deletions

View File

@ -2729,14 +2729,25 @@ config MSM_OCMEM_POWER_DEBUG
related operations of OCMEM. Both local power management
and RPM assisted power management operations are supported.
config MSM_OCMEM_POWER_DISABLE
bool "OCMEM Disable Power Control"
config MSM_OCMEM_DEBUG_ALWAYS_ON
bool "Keep OCMEM always turned ON"
depends on MSM_OCMEM_DEBUG
help
Always vote for all OCMEM clocks and keep all OCMEM
macros turned ON and never allow them to be turned OFF.
Both local power management and RPM assisted power modes
are supported for individual macro power control operations.
config MSM_OCMEM_POWER_DISABLE
bool "OCMEM Disable Power Control"
depends on MSM_OCMEM
help
Disable all OCMEM power management.
This keeps all OCMEM macros turned ON at all times thus
never allowing them to be turned OFF. Both local power
management and RPM assisted power modes are supported.
Skip all OCMEM power operations that turn ON or
turn OFF the macros. Both local power management and
RPM assisted power management operations are skipped.
Enable this configuration if OCMEM is being exclusively
used as GMEM or OCIMEM.
config SENSORS_ADSP
bool "Enable Sensors Driver Support for ADSP"

View File

@ -759,7 +759,7 @@ unlock_fail:
return -EINVAL;
}
#if defined(CONFIG_MSM_OCMEM_POWER_DISABLE)
#if defined(CONFIG_MSM_OCMEM_DEBUG_ALWAYS_ON)
static int ocmem_core_set_default_state(void)
{
int rc = 0;
@ -775,7 +775,14 @@ static int ocmem_core_set_default_state(void)
return 0;
}
#else
static int ocmem_core_set_default_state(void)
{
return 0;
}
#endif
#if defined(CONFIG_MSM_OCMEM_POWER_DISABLE)
/* Initializes a region to be turned ON in wide mode */
static int ocmem_region_set_default_state(unsigned int r_num)
{
@ -800,15 +807,9 @@ static int ocmem_region_set_default_state(unsigned int region_num)
{
return 0;
}
static int ocmem_core_set_default_state(void)
{
return 0;
}
#endif
#if defined(CONFIG_MSM_OCMEM_POWER_DEBUG)
static int read_hw_region_state(unsigned region_num)
{
int state;