summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/platsmp.c
diff options
context:
space:
mode:
authorMayuresh Kulkarni <mkulkarni@nvidia.com>2013-03-12 15:39:43 +0530
committerDan Willemsen <dwillemsen@nvidia.com>2013-09-14 13:02:47 -0700
commit67d78945d852971430f8aff63f49bfaa4fc1d8e4 (patch)
tree08638f8c6ccdde9edf0bdad07796040fb67af520 /arch/arm/mach-tegra/platsmp.c
parentd7c5e1cc1d56271a16a02a0c90c94366ae68a27e (diff)
ARM: tegra: remove duplicate defines for chip_id
- the chip id have been defined in 2 places: fuse.h as TEGRAXX & mach/hardware.h as TEGRA_CHIPID_TEGRAXX - some part of code used defines from fuse.h while others used mach/hardware.h - this commit removes the defines in fuse.h and converts all the code to use the defines from mach/hardware.h - kernel in dev-chips is also using defines from mach/hardware.h Change-Id: Ia65f8ead3f8eccdd6cba4a159c3d0e16a2566e41 Signed-off-by: Mayuresh Kulkarni <mkulkarni@nvidia.com> Reviewed-on: http://git-master/r/208375 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/platsmp.c')
-rw-r--r--arch/arm/mach-tegra/platsmp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/platsmp.c b/arch/arm/mach-tegra/platsmp.c
index 79a39ffee6b4..ca567f0cf0e0 100644
--- a/arch/arm/mach-tegra/platsmp.c
+++ b/arch/arm/mach-tegra/platsmp.c
@@ -308,7 +308,7 @@ static int __cpuinit tegra_boot_secondary(unsigned int cpu, struct task_struct *
#endif
switch (tegra_chip_id) {
- case TEGRA20:
+ case TEGRA_CHIPID_TEGRA2:
/*
* Unhalt the CPU. If the flow controller was used to power-gate
* the CPU this will cause the flow controller to stop driving
@@ -318,7 +318,7 @@ static int __cpuinit tegra_boot_secondary(unsigned int cpu, struct task_struct *
flowctrl_write_cpu_halt(cpu, 0);
status = tegra20_power_up_cpu(cpu);
break;
- case TEGRA30:
+ case TEGRA_CHIPID_TEGRA3:
/*
* Unhalt the CPU. If the flow controller was used to power-gate
* the CPU this will cause the flow controller to stop driving
@@ -328,8 +328,8 @@ static int __cpuinit tegra_boot_secondary(unsigned int cpu, struct task_struct *
flowctrl_write_cpu_halt(cpu, 0);
status = tegra30_power_up_cpu(cpu);
break;
- case TEGRA11X:
- case TEGRA14X:
+ case TEGRA_CHIPID_TEGRA11:
+ case TEGRA_CHIPID_TEGRA14:
status = tegra11x_power_up_cpu(cpu);
break;
default: