Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 19:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

st_smi: Add support for SPEAr SMI driver

Browse source 
SMI is the serial memory interface controller provided by ST.

Earlier, a driver exists in the u-boot source code for the SMI IP. However, it
was specific to spear platforms. This commit converts the same driver to a more
generic driver. As a result, the driver files are renamed to st_smi.c and
st_smi.h and moved into drivers/mtd folder for reusability by other platforms
using smi controller peripheral.

Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
Signed-off-by: Amit Virdi <amit.virdi@st.com>
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Vipin KUMAR 2012-05-07 13:00:19 +05:30 • committed by Albert ARIBAUD
parent 0def98e7be
commit f3fcf92d59
4 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/mtd/Makefile
View file

@ -35,7 +35,7 @@ COBJS-$(CONFIG_HAS_DATAFLASH) += dataflash.o
COBJS-$(CONFIG_FTSMC020) += ftsmc020.o COBJS-$(CONFIG_FTSMC020) += ftsmc020.o
COBJS-$(CONFIG_FLASH_CFI_LEGACY) += jedec_flash.o COBJS-$(CONFIG_FLASH_CFI_LEGACY) += jedec_flash.o
COBJS-$(CONFIG_MW_EEPROM) += mw_eeprom.o COBJS-$(CONFIG_MW_EEPROM) += mw_eeprom.o
COBJS-$(CONFIG_SPEARSMI) += spr_smi.o COBJS-$(CONFIG_ST_SMI) += st_smi.o
COBJS := $(COBJS-y) COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c) SRCS := $(COBJS:.o=.c)

7
drivers/mtd/spr_smi.c → drivers/mtd/st_smi.c
View file

@ -1,6 +1,6 @@
/* /*
* (C) Copyright 2009 * (C) Copyright 2009
* Vipin Kumar, ST Micoelectronics, vipin.kumar@st.com. * Vipin Kumar, ST Microelectronics, vipin.kumar@st.com.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
* project. * project.
@ -24,10 +24,10 @@
#include <common.h> #include <common.h>
#include <flash.h> #include <flash.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/mtd/st_smi.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
#include <asm/arch/spr_smi.h>
#if !defined(CONFIG_SYS_NO_FLASH) #if !defined(CONFIG_SYS_NO_FLASH)
@ -82,6 +82,7 @@ static unsigned int smi_read_id(flash_info_t *info, int banknum)
writel(READ_ID, &smicntl->smi_tr); writel(READ_ID, &smicntl->smi_tr);
writel((banknum << BANKSEL_SHIFT) | SEND | TX_LEN_1 | RX_LEN_3, writel((banknum << BANKSEL_SHIFT) | SEND | TX_LEN_1 | RX_LEN_3,
&smicntl->smi_cr2); &smicntl->smi_cr2);
smi_wait_xfer_finish(XFER_FINISH_TOUT); smi_wait_xfer_finish(XFER_FINISH_TOUT);
value = (readl(&smicntl->smi_rr) & 0x00FFFFFF); value = (readl(&smicntl->smi_rr) & 0x00FFFFFF);
@ -232,7 +233,7 @@ static int smi_write_enable(int bank)
* *
* SMI initialization routine. Sets SMI control register1. * SMI initialization routine. Sets SMI control register1.
*/ */
static void smi_init(void) void smi_init(void)
{ {
/* Setting the fast mode values. SMI working at 166/4 = 41.5 MHz */ /* Setting the fast mode values. SMI working at 166/4 = 41.5 MHz */
writel(HOLD1 | FAST_MODE | BANK_EN | DSEL_TIME | PRESCAL4, writel(HOLD1 | FAST_MODE | BANK_EN | DSEL_TIME | PRESCAL4,

6
include/configs/spear-common.h
View file

@ -55,10 +55,10 @@
#if defined(CONFIG_FLASH_PNOR) #if defined(CONFIG_FLASH_PNOR)
#define CONFIG_SPEAR_EMI 1 #define CONFIG_SPEAR_EMI 1
#else #else
#define CONFIG_SPEARSMI 1 #define CONFIG_ST_SMI
#endif #endif
#if defined(CONFIG_SPEARSMI) #if defined(CONFIG_ST_SMI)
#define CONFIG_SYS_MAX_FLASH_BANKS 2 #define CONFIG_SYS_MAX_FLASH_BANKS 2
#define CONFIG_SYS_FLASH_BASE (0xF8000000) #define CONFIG_SYS_FLASH_BASE (0xF8000000)
@ -125,7 +125,7 @@
* U-Boot Environment placing definitions. * U-Boot Environment placing definitions.
*/ */
#if defined(CONFIG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
#ifdef CONFIG_SPEARSMI #ifdef CONFIG_ST_SMI
/* /*
* Environment is in serial NOR flash * Environment is in serial NOR flash
*/ */

6
arch/arm/include/asm/arch-spear/spr_smi.h → include/linux/mtd/st_smi.h
View file

@ -21,8 +21,8 @@
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef SPR_SMI_H #ifndef ST_SMI_H
#define SPR_SMI_H #define ST_SMI_H
/* 0xF800.0000 . 0xFBFF.FFFF 64MB SMI (Serial Flash Mem) */ /* 0xF800.0000 . 0xFBFF.FFFF 64MB SMI (Serial Flash Mem) */
/* 0xFC00.0000 . 0xFC1F.FFFF 2MB SMI (Serial Flash Reg.) */ /* 0xFC00.0000 . 0xFC1F.FFFF 2MB SMI (Serial Flash Reg.) */
@ -112,4 +112,6 @@ struct flash_dev {
#define XFER_FINISH_TOUT 2 /* xfer finish timeout */ #define XFER_FINISH_TOUT 2 /* xfer finish timeout */
#define WMODE_TOUT 2 /* write enable timeout */ #define WMODE_TOUT 2 /* write enable timeout */
extern void smi_init(void);
#endif #endif