aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-omap2/Makefile2
-rw-r--r--arch/arm/mach-omap2/sdrc2xxx.c (renamed from arch/arm/mach-omap2/memory.c)14
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index bbd12bc10fdc..bb47d43af396 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -3,7 +3,7 @@
3# 3#
4 4
5# Common support 5# Common support
6obj-y := irq.o id.o io.o memory.o control.o prcm.o clock.o mux.o \ 6obj-y := irq.o id.o io.o sdrc2xxx.o control.o prcm.o clock.o mux.o \
7 devices.o serial.o gpmc.o timer-gp.o powerdomain.o \ 7 devices.o serial.o gpmc.o timer-gp.o powerdomain.o \
8 clockdomain.o 8 clockdomain.o
9 9
diff --git a/arch/arm/mach-omap2/memory.c b/arch/arm/mach-omap2/sdrc2xxx.c
index 93cb25715bac..3e38aa4ea458 100644
--- a/arch/arm/mach-omap2/memory.c
+++ b/arch/arm/mach-omap2/sdrc2xxx.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * linux/arch/arm/mach-omap2/memory.c 2 * linux/arch/arm/mach-omap2/sdrc2xxx.c
3 * 3 *
4 * Memory timing related functions for OMAP24XX 4 * SDRAM timing related functions for OMAP2xxx
5 * 5 *
6 * Copyright (C) 2005 Texas Instruments Inc. 6 * Copyright (C) 2005 Texas Instruments Inc.
7 * Richard Woodruff <r-woodruff2@ti.com> 7 * Richard Woodruff <r-woodruff2@ti.com>
@@ -89,13 +89,12 @@ u32 omap2_reprogram_sdrc(u32 level, u32 force)
89 if ((curr_perf_level == level) && !force) 89 if ((curr_perf_level == level) && !force)
90 return prev; 90 return prev;
91 91
92 if (level == CORE_CLK_SRC_DPLL) { 92 if (level == CORE_CLK_SRC_DPLL)
93 dll_ctrl = omap2_memory_get_slow_dll_ctrl(); 93 dll_ctrl = omap2_memory_get_slow_dll_ctrl();
94 } else if (level == CORE_CLK_SRC_DPLL_X2) { 94 else if (level == CORE_CLK_SRC_DPLL_X2)
95 dll_ctrl = omap2_memory_get_fast_dll_ctrl(); 95 dll_ctrl = omap2_memory_get_fast_dll_ctrl();
96 } else { 96 else
97 return prev; 97 return prev;
98 }
99 98
100 m_type = omap2_memory_get_type(); 99 m_type = omap2_memory_get_type();
101 100
@@ -124,7 +123,8 @@ void omap2_init_memory_params(u32 force_lock_to_unlock_mode)
124 unsigned long dll_cnt; 123 unsigned long dll_cnt;
125 u32 fast_dll = 0; 124 u32 fast_dll = 0;
126 125
127 mem_timings.m_type = !((sdrc_read_reg(SDRC_MR_0) & 0x3) == 0x1); /* DDR = 1, SDR = 0 */ 126 /* DDR = 1, SDR = 0 */
127 mem_timings.m_type = !((sdrc_read_reg(SDRC_MR_0) & 0x3) == 0x1);
128 128
129 /* 2422 es2.05 and beyond has a single SIP DDR instead of 2 like others. 129 /* 2422 es2.05 and beyond has a single SIP DDR instead of 2 like others.
130 * In the case of 2422, its ok to use CS1 instead of CS0. 130 * In the case of 2422, its ok to use CS1 instead of CS0.