From bbf79dff8c882237adf86b6d441b7dba4cecfa6b Mon Sep 17 00:00:00 2001 From: Varun Wadekar Date: Tue, 24 Jan 2012 11:06:23 +0530 Subject: arm: tegra: add chipid value to uniquely identify tegra3 BUG=chromium-os:23496 TEST=build for Cardhu, Waluigi Change-Id: Iacd6fdb178afbfdb978dbe53bbe2766916bf26f9 Signed-off-by: Varun Wadekar Reviewed-on: https://gerrit.chromium.org/gerrit/14685 --- arch/arm/cpu/armv7/tegra-common/warmboot.c | 2 +- arch/arm/include/asm/arch-tegra/warmboot.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'arch') diff --git a/arch/arm/cpu/armv7/tegra-common/warmboot.c b/arch/arm/cpu/armv7/tegra-common/warmboot.c index beb7a146ed..41e50036f9 100644 --- a/arch/arm/cpu/armv7/tegra-common/warmboot.c +++ b/arch/arm/cpu/armv7/tegra-common/warmboot.c @@ -101,7 +101,7 @@ static enum fuse_operating_mode fuse_get_operation_mode(void) (struct apb_misc_gp_ctlr *)NV_PA_APB_MISC_GP_BASE; chip_id = bf_readl(HIDREV_CHIPID, &gp->hidrev); - if (chip_id == CHIPID_TEGRA2) { + if (chip_id == CHIPID_TEGRA2 || chip_id == CHIPID_TEGRA3) { if (is_odm_production_mode()) { printf("!! odm_production_mode is not supported !!\n"); return MODE_UNDEFINED; diff --git a/arch/arm/include/asm/arch-tegra/warmboot.h b/arch/arm/include/asm/arch-tegra/warmboot.h index be264900bd..98120c4c19 100644 --- a/arch/arm/include/asm/arch-tegra/warmboot.h +++ b/arch/arm/include/asm/arch-tegra/warmboot.h @@ -33,7 +33,10 @@ #define HIDREV_HIDFAM_RANGE 3 : 0 /* CHIPID field returned from APB_MISC_GP_HIDREV register */ -#define CHIPID_TEGRA2 0x20 +enum tegra_chip_id { + CHIPID_TEGRA2 = 0x20, + CHIPID_TEGRA3 = 0x30, +}; #define STRAP_OPT_A_RAM_CODE_RANGE 7 : 4 -- cgit v1.2.3