diff options
| author | Bitan Biswas <bbiswas@nvidia.com> | 2013-07-08 20:43:23 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:30:48 -0700 |
| commit | 38ea2a2cb94ea75892b4e9dfc2345f1fbe8e2c56 (patch) | |
| tree | 5c7f2a2ed841d825ec14d016dad84cde80c66de0 | |
| parent | a36412815851d37e4ddf9e0d9791f05340647988 (diff) | |
ARM: tegra: powerdetect cell list update
T12x powerdetect cell list populated
bug 1317298
Change-Id: Ie104f6df035467536ca40bee60d290cdca743ef3
Signed-off-by: Bitan Biswas <bbiswas@nvidia.com>
Reviewed-on: http://git-master/r/246143
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Daniel Solomon <daniels@nvidia.com>
Tested-by: Daniel Solomon <daniels@nvidia.com>
Reviewed-by: Mitch Luban <mluban@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/powerdetect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/powerdetect.c b/arch/arm/mach-tegra/powerdetect.c index 5db49481a3c2..ea8f61d220ad 100644 --- a/arch/arm/mach-tegra/powerdetect.c +++ b/arch/arm/mach-tegra/powerdetect.c @@ -85,7 +85,7 @@ static struct pwr_detect_cell pwr_detect_cells[] = { #endif #ifdef CONFIG_ARCH_TEGRA_2x_SOC POWER_CELL("pwrdet_vi", 0, (0x1 << 4), 0xFFFFFFFF), -#else +#elif defined(CONFIG_ARCH_TEGRA_3x_SOC) /* Tegra3 VI is connected on MID package only (id = 1, mask = 0x2) */ POWER_CELL("pwrdet_vi", 0, (0x1 << 4), 0x00000002), #endif @@ -101,13 +101,13 @@ static struct pwr_detect_cell pwr_detect_cells[] = { #endif #ifndef CONFIG_ARCH_TEGRA_2x_SOC POWER_CELL("pwrdet_cam", (0x1 << 10), (0x1 << 10), 0xFFFFFFFF), -#ifdef CONFIG_ARCH_TEGRA_3x_SOC +#if defined(CONFIG_ARCH_TEGRA_3x_SOC) || defined(CONFIG_ARCH_TEGRA_12x_SOC) POWER_CELL("pwrdet_pex_ctl", (0x1 << 11), (0x1 << 11), 0xFFFFFFFF), #endif POWER_CELL("pwrdet_sdmmc1", (0x1 << 12), (0x1 << 12), 0xFFFFFFFF), POWER_CELL("pwrdet_sdmmc3", (0x1 << 13), (0x1 << 13), 0xFFFFFFFF), POWER_CELL("pwrdet_sdmmc4", 0, (0x1 << 14), 0xFFFFFFFF), -#ifdef CONFIG_ARCH_TEGRA_11x_SOC +#if defined(CONFIG_ARCH_TEGRA_11x_SOC) || defined(CONFIG_ARCH_TEGRA_12x_SOC) POWER_CELL("pwrdet_hv", (0x1 << 15), (0x1 << 15), 0xFFFFFFFF), #endif #endif |