diff options
| author | Colin Cross <ccross@android.com> | 2011-10-15 21:56:19 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-10-15 21:56:19 -0700 |
| commit | 79cfeae7d4060a36666aed89d7a838971258570c (patch) | |
| tree | f24af5d9f64327e126a162e2d18adf6fadf70c57 | |
| parent | 1483e9ab72de9055a4ab56044686ce944a80b0b3 (diff) | |
| parent | a50dfd171ad9d7116163ff4d8d1b8278208aa6c4 (diff) | |
| download | kernel_samsung_tuna-79cfeae7d4060a36666aed89d7a838971258570c.zip kernel_samsung_tuna-79cfeae7d4060a36666aed89d7a838971258570c.tar.gz kernel_samsung_tuna-79cfeae7d4060a36666aed89d7a838971258570c.tar.bz2 | |
Merge branch 'linux-omap-3.0' into android-omap-3.0
| -rw-r--r-- | arch/arm/mach-omap2/emif.c | 7 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/include/mach/emif.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/emif.c b/arch/arm/mach-omap2/emif.c index 6d910f2..2144150 100644 --- a/arch/arm/mach-omap2/emif.c +++ b/arch/arm/mach-omap2/emif.c @@ -594,7 +594,7 @@ static void setup_registers(u32 emif_nr, struct emif_regs *regs, u32 volt_state) base + OMAP44XX_EMIF_PWR_MGMT_CTRL_SHDW); /* Configure EMIF Automatic Power Management to Self-refresh mode */ - if (regs->emif_ddr_selfrefresh_time >= 0) { + if (regs->emif_ddr_selfrefresh_cycles >= 0) { u32 num_cycles, ddr_sr_timer; temp = __raw_readl(base + OMAP44XX_EMIF_PWR_MGMT_CTRL_SHDW); @@ -602,7 +602,7 @@ static void setup_registers(u32 emif_nr, struct emif_regs *regs, u32 volt_state) * Configure the self refresh timing * base value starts at 16 cycles mapped to 1( __ffs(16) = 4) */ - num_cycles = ns_2_cycles(regs->emif_ddr_selfrefresh_time); + num_cycles = regs->emif_ddr_selfrefresh_cycles; if (num_cycles >= 16) ddr_sr_timer = __fls(num_cycles) - 3; else @@ -962,7 +962,8 @@ static void emif_calculate_regs(const struct emif_device_details *devices, emif_assert(addressing); regs->RL_final = timings->RL; - regs->emif_ddr_selfrefresh_time = timings->omap_emif_self_refresh_time; + regs->emif_ddr_selfrefresh_cycles = + ns_2_cycles(timings->omap_emif_self_refresh_time); /* * Initial value of EMIF_SDRAM_CONFIG corresponds to the base * frequency - 19.2 MHz diff --git a/arch/arm/mach-omap2/include/mach/emif.h b/arch/arm/mach-omap2/include/mach/emif.h index 3301f98..a29c5e7 100644 --- a/arch/arm/mach-omap2/include/mach/emif.h +++ b/arch/arm/mach-omap2/include/mach/emif.h @@ -277,7 +277,7 @@ struct emif_regs { u32 temp_alert_config_derated; u32 emif_ddr_phy_ctlr_1_init; u32 emif_ddr_phy_ctlr_1_final; - s32 emif_ddr_selfrefresh_time; + s32 emif_ddr_selfrefresh_cycles; }; int omap_emif_setup_registers(u32 freq, |