From f7374a2466488eda688eb8ea8d1b586f8c48383f Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Mon, 15 Feb 2010 01:46:01 +0100 Subject: [PATCH 2/2] Colibri/PXA320: Preconfigure SMEMC Signed-off-by: Marek Vasut --- arch/arm/mach-pxa/colibri-pxa320.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-pxa/colibri-pxa320.c b/arch/arm/mach-pxa/colibri-pxa320.c index ae835fa..6e4f059 100644 --- a/arch/arm/mach-pxa/colibri-pxa320.c +++ b/arch/arm/mach-pxa/colibri-pxa320.c @@ -31,6 +31,7 @@ #include "generic.h" #include "devices.h" +#include "smemc.h" #if defined(CONFIG_AX88796) #define COLIBRI_ETH_IRQ_GPIO mfp_to_gpio(GPIO36_GPIO) @@ -166,6 +167,17 @@ static inline void __init colibri_pxa320_init_ac97(void) static inline void colibri_pxa320_init_ac97(void) {} #endif +static struct pxa_smemc_info smemc_info __initdata = { + .msc[0] = 0x7ff07ff0, + .msc[1] = 0x00000779, + .sxcnfg = 0x00880008, + .memclkcfg = 0x00030003, + .csadrcfg[0] = 0x00020000, + .csadrcfg[1] = 0x00020000, + .csadrcfg[2] = 0x0032c809, + .csadrcfg[3] = 0x00020000, +}; + /* * The following configuration is verified to work with the Toradex Orchid * carrier board @@ -199,6 +211,8 @@ static void __init colibri_pxa320_init_uart(void) void __init colibri_pxa320_init(void) { + pxa_set_smemc_info(&smemc_info); + pxa_set_ffuart_info(NULL); pxa_set_btuart_info(NULL); pxa_set_stuart_info(NULL); -- 1.6.6.1