diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv7/tegra2/ap20.c | 6 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/tegra2/clock.c | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra2/clock.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/cpu/armv7/tegra2/ap20.c b/arch/arm/cpu/armv7/tegra2/ap20.c index 75fdf7c22f5..6d589143281 100644 --- a/arch/arm/cpu/armv7/tegra2/ap20.c +++ b/arch/arm/cpu/armv7/tegra2/ap20.c @@ -42,7 +42,7 @@ struct clk_pll_table { }; /* ~0=uninitialized/unknown, 0=false, 1=true */ -int is_tegra2_cold_boot = 0xffffffff; +uint32_t is_tegra2_processor_reset = 0xffffffff; /* * Timing tables for each SOC for all four oscillator options. @@ -387,7 +387,7 @@ void tegra2_start(void) /* FIXME: should have ap20's L2 disabled too? */ - /* Init is_tegra2_cold_boot */ - is_tegra2_cold_boot = check_is_tegra2_cold_boot(); + /* Init is_tegra2_processor_reset */ + is_tegra2_processor_reset = check_is_tegra2_processor_reset(); } diff --git a/arch/arm/cpu/armv7/tegra2/clock.c b/arch/arm/cpu/armv7/tegra2/clock.c index 0e8acf1d3be..7227e5850af 100644 --- a/arch/arm/cpu/armv7/tegra2/clock.c +++ b/arch/arm/cpu/armv7/tegra2/clock.c @@ -902,7 +902,7 @@ int clock_verify(void) return 0; } -int check_is_tegra2_cold_boot(void) +uint32_t check_is_tegra2_processor_reset(void) { u32 base_reg; struct clk_pll *pll; diff --git a/arch/arm/include/asm/arch-tegra2/clock.h b/arch/arm/include/asm/arch-tegra2/clock.h index 28a5b95ee73..99d9bf12c07 100644 --- a/arch/arm/include/asm/arch-tegra2/clock.h +++ b/arch/arm/include/asm/arch-tegra2/clock.h @@ -348,8 +348,8 @@ unsigned clock_adjust_periph_pll_div(enum periph_id periph_id, */ unsigned clock_get_rate(enum clock_id clkid); -/* Return 1=cold boot; 0=not cold boot */ -int check_is_tegra2_cold_boot(void); +/* Return 1=processor reset; 0=not */ +uint32_t check_is_tegra2_processor_reset(void); /* * Checks that clocks are valid and prints a warning if not |