diff options
| author | Yudong Tan <ytan@nvidia.com> | 2011-07-01 11:26:17 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:47:19 -0800 |
| commit | f8cd6295ec46744ca93a76cc430faacbaac664a4 (patch) | |
| tree | 2913d021afa34b271b3fd1f0fa778de23e309f13 /arch/arm/mach-tegra/timer-t3.c | |
| parent | 607cfa68323723eb2566f7259c6de9fe94703292 (diff) | |
arm: tegra: Use new platform types
This change is needed to support three different platforms, silicon,
fpga and simulation.
Change-Id: I407853e1d86accbe3686deb4f34571fe6b10bcce
Reviewed-on: http://git-master/r/36351
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Rebase-Id: Rc4b424f1a55ffb71245f3a8330559258124e2a19
Diffstat (limited to 'arch/arm/mach-tegra/timer-t3.c')
| -rw-r--r-- | arch/arm/mach-tegra/timer-t3.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/timer-t3.c b/arch/arm/mach-tegra/timer-t3.c index f126af0a7653..4e03d02c7ef5 100644 --- a/arch/arm/mach-tegra/timer-t3.c +++ b/arch/arm/mach-tegra/timer-t3.c @@ -245,16 +245,16 @@ void __init tegra3_init_timer(u32 *offset, int *irq) #ifdef CONFIG_PM_SLEEP /* For T30.A01 use INT_TMR_SHARED instead of INT_TMR6. */ if (((id & 0xFF00) >> 8) == 0x30) { -#ifdef CONFIG_TEGRA_FPGA_PLATFORM +#ifdef CONFIG_TEGRA_SILICON_PLATFORM + if (((id >> 16) & 0xf) == 1) + tegra_lp2wake_irq[3].irq = INT_TMR_SHARED; +#else void __iomem *emu_rev = IO_ADDRESS(TEGRA_APB_MISC_BASE) + 0x860; unsigned long reg = readl(emu_rev); unsigned long netlist = reg & 0xFFFF; unsigned long patch = (reg >> 16) & 0xFF; if ((netlist == 12) && (patch < 14)) tegra_lp2wake_irq[3].irq = INT_TMR_SHARED; -#else - if (((id >> 16) & 0xf) == 1) - tegra_lp2wake_irq[3].irq = INT_TMR_SHARED; #endif } |