diff options
| author | Mayuresh Kulkarni <mkulkarni@nvidia.com> | 2013-03-12 15:39:43 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:02:47 -0700 |
| commit | 67d78945d852971430f8aff63f49bfaa4fc1d8e4 (patch) | |
| tree | 08638f8c6ccdde9edf0bdad07796040fb67af520 /arch/arm/mach-tegra/edp.c | |
| parent | d7c5e1cc1d56271a16a02a0c90c94366ae68a27e (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/edp.c')
| -rw-r--r-- | arch/arm/mach-tegra/edp.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/edp.c b/arch/arm/mach-tegra/edp.c index 125f6f2b6f9f..0fe849d18567 100644 --- a/arch/arm/mach-tegra/edp.c +++ b/arch/arm/mach-tegra/edp.c @@ -25,7 +25,9 @@ #include <linux/module.h> #include <linux/uaccess.h> #include <linux/edp.h> + #include <mach/edp.h> +#include <mach/hardware.h> #include "fuse.h" #include "dvfs.h" @@ -811,7 +813,7 @@ static int __init init_cpu_edp_limits_lookup(void) void tegra_recalculate_cpu_edp_limits(void) { - if (tegra_chip_id == TEGRA11X) + if (tegra_chip_id == TEGRA_CHIPID_TEGRA11) init_cpu_edp_limits_calculated(); } @@ -826,16 +828,16 @@ void __init tegra_init_cpu_edp_limits(unsigned int regulator_mA) regulator_cur = regulator_mA + OVERRIDE_DEFAULT; switch (tegra_chip_id) { - case TEGRA30: + case TEGRA_CHIPID_TEGRA3: if (init_cpu_edp_limits_lookup() == 0) return; break; - case TEGRA11X: - case TEGRA14X: + case TEGRA_CHIPID_TEGRA11: + case TEGRA_CHIPID_TEGRA14: if (init_cpu_edp_limits_calculated() == 0) return; break; - case TEGRA20: + case TEGRA_CHIPID_TEGRA2: default: BUG(); break; |