diff options
| author | Tom Rini <trini@konsulko.com> | 2015-07-29 18:58:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-07-29 18:58:39 -0400 |
| commit | cc35734358540a1bbaf042fdf9f4cb2de17389ed (patch) | |
| tree | 95163aad5ff5430fdd6fb92c52f26eae46957c2c /arch/arm/include/asm/arch-tegra/pmc.h | |
| parent | 488d19cbcace0b87a2d08881eab7356088198903 (diff) | |
| parent | 873e3ef90ba98c764af6e05251354332205b9d3a (diff) | |
| download | blackbird-obmc-uboot-cc35734358540a1bbaf042fdf9f4cb2de17389ed.tar.gz blackbird-obmc-uboot-cc35734358540a1bbaf042fdf9f4cb2de17389ed.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Diffstat (limited to 'arch/arm/include/asm/arch-tegra/pmc.h')
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/pmc.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/include/asm/arch-tegra/pmc.h b/arch/arm/include/asm/arch-tegra/pmc.h index 1dd3154fbc..66c0879765 100644 --- a/arch/arm/include/asm/arch-tegra/pmc.h +++ b/arch/arm/include/asm/arch-tegra/pmc.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2010,2011,2014 + * (C) Copyright 2010-2015 * NVIDIA Corporation <www.nvidia.com> * * SPDX-License-Identifier: GPL-2.0+ @@ -294,6 +294,7 @@ struct pmc_ctlr { #define CRAIL 0 #define CE0 14 #define C0NC 15 +#define SOR 17 #define PMC_XOFS_SHIFT 1 #define PMC_XOFS_MASK (0x3F << PMC_XOFS_SHIFT) @@ -303,7 +304,7 @@ struct pmc_ctlr { #define TIMER_MULT_MASK (3 << TIMER_MULT_SHIFT) #define TIMER_MULT_CPU_SHIFT 2 #define TIMER_MULT_CPU_MASK (3 << TIMER_MULT_CPU_SHIFT) -#elif defined(CONFIG_TEGRA124) +#elif defined(CONFIG_TEGRA124) || defined(CONFIG_TEGRA210) #define TIMER_MULT_SHIFT 0 #define TIMER_MULT_MASK (7 << TIMER_MULT_SHIFT) #define TIMER_MULT_CPU_SHIFT 3 @@ -314,7 +315,7 @@ struct pmc_ctlr { #define MULT_2 1 #define MULT_4 2 #define MULT_8 3 -#if defined(CONFIG_TEGRA124) +#if defined(CONFIG_TEGRA124) || defined(CONFIG_TEGRA210) #define MULT_16 4 #endif |
