diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-10-30 09:44:52 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-10-30 09:44:52 +0100 |
| commit | 104aecadc34ec12d14bad0ad71d2b88c59ae9dd8 (patch) | |
| tree | 2c6c944420d7e5518f9246fe01a838261aeae34d /arch | |
| parent | 604c39da346537ac1168fdcde1dcfb12506b5416 (diff) | |
| parent | b39a120de590a04a6bb7f04cb4cffa5f6aed715e (diff) | |
Merge branch 'chromeos-v2011.06' into colibri
Conflicts:
arch/arm/cpu/armv7/tegra3/warmboot_avp.c
arch/arm/include/asm/arch-tegra/clk_rst.h
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv7/tegra3/warmboot_avp.c | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/clk_rst.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/tegra3/warmboot_avp.c b/arch/arm/cpu/armv7/tegra3/warmboot_avp.c index 02d320aed7..5281e8f86f 100644 --- a/arch/arm/cpu/armv7/tegra3/warmboot_avp.c +++ b/arch/arm/cpu/armv7/tegra3/warmboot_avp.c @@ -81,7 +81,7 @@ void wb_start(void) reg = SCLK_SWAKE_FIQ_SRC_CLKM | SCLK_SWAKE_IRQ_SRC_CLKM | SCLK_SWAKE_RUN_SRC_CLKM | SCLK_SWAKE_IDLE_SRC_CLKM | - SCLK_SYS_CPU_STATE_RUN; + (SCLK_SYS_STATE_RUN << SCLK_SYS_STATE_SHIFT); writel(reg, &clkrst->crc_sclk_brst_pol); /* Update PLLP output dividers for 408 MHz operation */ diff --git a/arch/arm/include/asm/arch-tegra/clk_rst.h b/arch/arm/include/asm/arch-tegra/clk_rst.h index 3233d3b9d0..d170b3c723 100644 --- a/arch/arm/include/asm/arch-tegra/clk_rst.h +++ b/arch/arm/include/asm/arch-tegra/clk_rst.h @@ -275,7 +275,6 @@ enum { #define SUPER_CDIV_ENB (1 << 31) /* CRC_SCLK_BURST_POLICY_0 28h */ -#define SCLK_SYS_CPU_STATE_RUN (2 << 28) #define SCLK_SWAKE_FIQ_SRC_CLKM (0 << 12) #define SCLK_SWAKE_IRQ_SRC_CLKM (0 << 8) #define SCLK_SWAKE_RUN_SRC_CLKM (0 << 4) |