summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/armv7/omap5/hwinit.c
diff options
context:
space:
mode:
authorSricharan R <r.sricharan@ti.com>2013-05-30 03:19:39 +0000
committerTom Rini <trini@ti.com>2013-06-10 08:43:10 -0400
commit92b0482c17acf92f94ac74fd8536fd95d5b64b5e (patch)
tree1b8357119fd332ae53f60e03e3962973347b7958 /arch/arm/cpu/armv7/omap5/hwinit.c
parent97405d843ece2a53e67b801e02ee42005d26e172 (diff)
downloadblackbird-obmc-uboot-92b0482c17acf92f94ac74fd8536fd95d5b64b5e.tar.gz
blackbird-obmc-uboot-92b0482c17acf92f94ac74fd8536fd95d5b64b5e.zip
ARM: DRA7xx: EMIF: Change settings required for EVM board
DRA7 EVM board has the below configuration. Adding the settings for the same here. 2Gb_1_35V_DDR3L part * 2 on EMIF1 2Gb_1_35V_DDR3L part * 4 on EMIF2 Signed-off-by: Sricharan R <r.sricharan@ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Diffstat (limited to 'arch/arm/cpu/armv7/omap5/hwinit.c')
-rw-r--r--arch/arm/cpu/armv7/omap5/hwinit.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/arch/arm/cpu/armv7/omap5/hwinit.c b/arch/arm/cpu/armv7/omap5/hwinit.c
index 40dbf45705..daf124e99c 100644
--- a/arch/arm/cpu/armv7/omap5/hwinit.c
+++ b/arch/arm/cpu/armv7/omap5/hwinit.c
@@ -100,16 +100,21 @@ static void io_settings_ddr3(void)
writel(ioregs->ctrl_emif_sdram_config_ext,
(*ctrl)->control_emif2_sdram_config_ext);
- /* Disable DLL select */
- io_settings = (readl((*ctrl)->control_port_emif1_sdram_config)
+ if (is_omap54xx()) {
+ /* Disable DLL select */
+ io_settings = (readl((*ctrl)->control_port_emif1_sdram_config)
& 0xFFEFFFFF);
- writel(io_settings,
- (*ctrl)->control_port_emif1_sdram_config);
+ writel(io_settings,
+ (*ctrl)->control_port_emif1_sdram_config);
- io_settings = (readl((*ctrl)->control_port_emif2_sdram_config)
+ io_settings = (readl((*ctrl)->control_port_emif2_sdram_config)
& 0xFFEFFFFF);
- writel(io_settings,
- (*ctrl)->control_port_emif2_sdram_config);
+ writel(io_settings,
+ (*ctrl)->control_port_emif2_sdram_config);
+ } else {
+ writel(ioregs->ctrl_ddr_ctrl_ext_0,
+ (*ctrl)->control_ddr_control_ext_0);
+ }
}
/*
OpenPOWER on IntegriCloud