ARM: tegra: fix TEGRA_NUM_POWERGATE value per SOC
Mayuresh Kulkarni [Tue, 14 May 2013 10:50:02 +0000 (15:50 +0530)]
bug 1249871

Change-Id: I07a9dbdc4f2177e13e64f1312a1288c5ba77375f
Signed-off-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Reviewed-on: http://git-master/r/228354
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Jin Qian <jqian@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

arch/arm/mach-tegra/include/mach/powergate.h

index 74c3c58..7842fb3 100644 (file)
 #define TEGRA_POWERGATE_XUSBA  20
 #define TEGRA_POWERGATE_XUSBB  21
 #define TEGRA_POWERGATE_XUSBC  22
-#if defined(CONFIG_ARCH_TEGRA_14x_SOC) || defined(CONFIG_ARCH_TEGRA_12x_SOC)
+#if defined(CONFIG_ARCH_TEGRA_12x_SOC)
 #define TEGRA_POWERGATE_VIC    23
+#endif
+#if defined(CONFIG_ARCH_TEGRA_14x_SOC) || defined(CONFIG_ARCH_TEGRA_12x_SOC)
 #define TEGRA_POWERGATE_IRAM   24
 #endif
 
@@ -75,7 +77,7 @@
 #elif defined(CONFIG_ARCH_TEGRA_11x_SOC)
 #define TEGRA_NUM_POWERGATE    23
 #else
-#define TEGRA_NUM_POWERGATE    25
+#define TEGRA_NUM_POWERGATE    24
 #endif
 #define TEGRA_CPU_POWERGATE_ID(cpu)    ((cpu == 0) ? TEGRA_POWERGATE_CPU0 : \
                                                (cpu + TEGRA_POWERGATE_CPU1 - 1))