minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 12:39:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

st_smi: Move status register read before modifying ctrl register

Browse Source 
Signed-off-by: Shiraz Hashim <shiraz.hashim@st.com>
Signed-off-by: Amit Virdi <amit.virdi@st.com>
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Shiraz Hashim 2012-05-07 13:00:24 +05:30 committed by Albert ARIBAUD
parent 0befe7d7a3
commit a59c7b37b9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mtd/st_smi.c
View File

@ -148,7 +148,7 @@ static ulong flash_get_size(ulong base, int banknum)
*/ */
static int smi_read_sr(int bank) static int smi_read_sr(int bank)
{ {
u32 ctrlreg1; u32 ctrlreg1, val;
/* store the CTRL REG1 state */ /* store the CTRL REG1 state */
ctrlreg1 = readl(&smicntl->smi_cr1); ctrlreg1 = readl(&smicntl->smi_cr1);
@ -163,10 +163,12 @@ static int smi_read_sr(int bank)
if (smi_wait_xfer_finish(XFER_FINISH_TOUT)) if (smi_wait_xfer_finish(XFER_FINISH_TOUT))
return -1; return -1;
val = readl(&smicntl->smi_sr);
/* Restore the CTRL REG1 state */ /* Restore the CTRL REG1 state */
writel(ctrlreg1, &smicntl->smi_cr1); writel(ctrlreg1, &smicntl->smi_cr1);
return readl(&smicntl->smi_sr); return val;
} }
/* /*