diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-09-01 15:03:48 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:48:42 -0800 |
| commit | 5d488552d4ef37349307f540258500345717893b (patch) | |
| tree | c2f21be25f54c57b0fa026b74be39012c2d434c5 /arch | |
| parent | cadb35919f2f1c0e7fc3dbc63409e1f2aa808c22 (diff) | |
ARM: tegra: Clean up power gating code
Clean up conditionals.
Use the generic name of CELP for the LP partition.
Change-Id: Iaad7fa36b76ee6d694eca56f11dba8fad009a447
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-on: http://git-master/r/50357
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
Rebase-Id: R06d260a102540afae03bb0684fde4efe4c144a1a
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/powergate.h | 15 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/powergate.c | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/arch/arm/mach-tegra/include/mach/powergate.h b/arch/arm/mach-tegra/include/mach/powergate.h index 9a3ad6ca9378..40a8af142220 100644 --- a/arch/arm/mach-tegra/include/mach/powergate.h +++ b/arch/arm/mach-tegra/include/mach/powergate.h @@ -29,22 +29,23 @@ #define TEGRA_POWERGATE_VDEC 4 #define TEGRA_POWERGATE_L2 5 #define TEGRA_POWERGATE_MPE 6 -#if defined(CONFIG_ARCH_TEGRA_2x_SOC) -#define TEGRA_NUM_POWERGATE 7 -#define TEGRA_CPU_POWERGATE_ID(cpu) (TEGRA_POWERGATE_CPU) -#define TEGRA_IS_CPU_POWERGATE_ID(id) ((id) == TEGRA_POWERGATE_CPU) -#elif defined(CONFIG_ARCH_TEGRA_3x_SOC) #define TEGRA_POWERGATE_HEG 7 #define TEGRA_POWERGATE_SATA 8 #define TEGRA_POWERGATE_CPU1 9 #define TEGRA_POWERGATE_CPU2 10 #define TEGRA_POWERGATE_CPU3 11 -#define TEGRA_POWERGATE_A9LP 12 +#define TEGRA_POWERGATE_CELP 12 #define TEGRA_POWERGATE_3D1 13 + +#if defined(CONFIG_ARCH_TEGRA_2x_SOC) +#define TEGRA_NUM_POWERGATE 7 +#define TEGRA_CPU_POWERGATE_ID(cpu) (TEGRA_POWERGATE_CPU) +#define TEGRA_IS_CPU_POWERGATE_ID(id) ((id) == TEGRA_POWERGATE_CPU) +#else #define TEGRA_NUM_POWERGATE 14 #define TEGRA_CPU_POWERGATE_ID(cpu) ((cpu == 0) ? TEGRA_POWERGATE_CPU0 : \ (cpu + TEGRA_POWERGATE_CPU1 - 1)) -#define TEGRA_IS_CPU_POWERGATE_ID(id) (((id) == TEGRA_POWERGATE_CPU) || \ +#define TEGRA_IS_CPU_POWERGATE_ID(id) (((id) == TEGRA_POWERGATE_CPU0) || \ ((id) == TEGRA_POWERGATE_CPU1) || \ ((id) == TEGRA_POWERGATE_CPU2) || \ ((id) == TEGRA_POWERGATE_CPU3)) diff --git a/arch/arm/mach-tegra/powergate.c b/arch/arm/mach-tegra/powergate.c index 2e3abef55f86..223156e5cc90 100644 --- a/arch/arm/mach-tegra/powergate.c +++ b/arch/arm/mach-tegra/powergate.c @@ -140,7 +140,7 @@ static struct powergate_partition powergate_partition_info[TEGRA_NUM_POWERGATE] [TEGRA_POWERGATE_CPU1] = { "cpu1", {MC_CLIENT_LAST}, }, [TEGRA_POWERGATE_CPU2] = { "cpu2", {MC_CLIENT_LAST}, }, [TEGRA_POWERGATE_CPU3] = { "cpu3", {MC_CLIENT_LAST}, }, - [TEGRA_POWERGATE_A9LP] = { "a9lp", {MC_CLIENT_LAST}, }, + [TEGRA_POWERGATE_CELP] = { "celp", {MC_CLIENT_LAST}, }, [TEGRA_POWERGATE_SATA] = { "sata", {MC_CLIENT_SATA, MC_CLIENT_LAST}, {{"sata", CLK_AND_RST}, {"sata_oob", CLK_AND_RST}, |