mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-24 21:54:01 +00:00
stm32: stm32f4: move flash driver to mtd driver location
Same flash driver can be used by other stm32 families like stm32f7. Better place for this driver would be mtd driver location. Signed-off-by: Vikas Manocha <vikas.manocha@st.com>
This commit is contained in:
parent
f9d0fd8a56
commit
9ecb0c416c
8 changed files with 59 additions and 50 deletions
|
@ -82,16 +82,6 @@ struct stm32_pwr_regs {
|
|||
u32 csr;
|
||||
};
|
||||
|
||||
struct stm32_flash_regs {
|
||||
u32 acr;
|
||||
u32 key;
|
||||
u32 optkeyr;
|
||||
u32 sr;
|
||||
u32 cr;
|
||||
u32 optcr;
|
||||
u32 optcr1;
|
||||
};
|
||||
|
||||
/*
|
||||
* Registers access macros
|
||||
*/
|
||||
|
@ -104,18 +94,6 @@ struct stm32_flash_regs {
|
|||
#define STM32_PWR_BASE (STM32_APB1PERIPH_BASE + 0x7000)
|
||||
#define STM32_PWR ((struct stm32_pwr_regs *)STM32_PWR_BASE)
|
||||
|
||||
#define STM32_FLASH_BASE (STM32_AHB1PERIPH_BASE + 0x3C00)
|
||||
#define STM32_FLASH ((struct stm32_flash_regs *)STM32_FLASH_BASE)
|
||||
|
||||
#define STM32_FLASH_SR_BSY (1 << 16)
|
||||
|
||||
#define STM32_FLASH_CR_PG (1 << 0)
|
||||
#define STM32_FLASH_CR_SER (1 << 1)
|
||||
#define STM32_FLASH_CR_STRT (1 << 16)
|
||||
#define STM32_FLASH_CR_LOCK (1 << 31)
|
||||
#define STM32_FLASH_CR_SNB_OFFSET 3
|
||||
#define STM32_FLASH_CR_SNB_MASK (15 << STM32_FLASH_CR_SNB_OFFSET)
|
||||
|
||||
/*
|
||||
* Peripheral base addresses
|
||||
*/
|
||||
|
@ -124,6 +102,14 @@ struct stm32_flash_regs {
|
|||
#define STM32_USART3_BASE (STM32_APB1PERIPH_BASE + 0x4800)
|
||||
#define STM32_USART6_BASE (STM32_APB2PERIPH_BASE + 0x1400)
|
||||
|
||||
#define FLASH_CNTL_BASE (STM32_AHB1PERIPH_BASE + 0x3C00)
|
||||
|
||||
static const u32 sect_sz_kb[CONFIG_SYS_MAX_FLASH_SECT] = {
|
||||
[0 ... 3] = 16 * 1024,
|
||||
[4] = 64 * 1024,
|
||||
[5 ... 11] = 128 * 1024
|
||||
};
|
||||
|
||||
enum clock {
|
||||
CLOCK_CORE,
|
||||
CLOCK_AHB,
|
||||
|
@ -133,5 +119,6 @@ enum clock {
|
|||
|
||||
int configure_clocks(void);
|
||||
unsigned long clock_get(enum clock clck);
|
||||
void stm32_flash_latency_cfg(int latency);
|
||||
|
||||
#endif /* _MACH_STM32_H_ */
|
||||
|
|
|
@ -8,4 +8,4 @@
|
|||
# SPDX-License-Identifier: GPL-2.0+
|
||||
#
|
||||
|
||||
obj-y += soc.o clock.o timer.o flash.o
|
||||
obj-y += soc.o clock.o timer.o
|
||||
|
|
|
@ -66,11 +66,6 @@
|
|||
#define PWR_CR_VOS_SCALE_MODE_2 (PWR_CR_VOS1)
|
||||
#define PWR_CR_VOS_SCALE_MODE_3 (PWR_CR_VOS0)
|
||||
|
||||
#define FLASH_ACR_WS(n) n
|
||||
#define FLASH_ACR_PRFTEN (1 << 8)
|
||||
#define FLASH_ACR_ICEN (1 << 9)
|
||||
#define FLASH_ACR_DCEN (1 << 10)
|
||||
|
||||
/*
|
||||
* RCC GPIO specific definitions
|
||||
*/
|
||||
|
@ -181,10 +176,7 @@ int configure_clocks(void)
|
|||
while (!(readl(&STM32_RCC->cr) & RCC_CR_PLLRDY))
|
||||
;
|
||||
|
||||
/* 5 wait states, Prefetch enabled, D-Cache enabled, I-Cache enabled */
|
||||
writel(FLASH_ACR_WS(5) | FLASH_ACR_PRFTEN | FLASH_ACR_ICEN
|
||||
| FLASH_ACR_DCEN, &STM32_FLASH->acr);
|
||||
|
||||
stm32_flash_latency_cfg(5);
|
||||
clrbits_le32(&STM32_RCC->cfgr, (RCC_CFGR_SW0 | RCC_CFGR_SW1));
|
||||
setbits_le32(&STM32_RCC->cfgr, RCC_CFGR_SW_PLL);
|
||||
|
||||
|
|
|
@ -20,3 +20,4 @@ obj-$(CONFIG_FTSMC020) += ftsmc020.o
|
|||
obj-$(CONFIG_FLASH_CFI_LEGACY) += jedec_flash.o
|
||||
obj-$(CONFIG_MW_EEPROM) += mw_eeprom.o
|
||||
obj-$(CONFIG_ST_SMI) += st_smi.o
|
||||
obj-$(CONFIG_STM32_FLASH) += stm32_flash.o
|
||||
|
|
|
@ -8,19 +8,20 @@
|
|||
#include <common.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/arch/stm32.h>
|
||||
|
||||
#define STM32_FLASH_KEY1 0x45670123
|
||||
#define STM32_FLASH_KEY2 0xCDEF89AB
|
||||
#include "stm32_flash.h"
|
||||
|
||||
flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];
|
||||
|
||||
const u32 sect_sz_kb[CONFIG_SYS_MAX_FLASH_SECT] = {
|
||||
[0 ... 3] = 16 * 1024,
|
||||
[4] = 64 * 1024,
|
||||
[5 ... 11] = 128 * 1024
|
||||
};
|
||||
#define STM32_FLASH ((struct stm32_flash_regs *)FLASH_CNTL_BASE)
|
||||
|
||||
static void stm32f4_flash_lock(u8 lock)
|
||||
void stm32_flash_latency_cfg(int latency)
|
||||
{
|
||||
/* 5 wait states, Prefetch enabled, D-Cache enabled, I-Cache enabled */
|
||||
writel(FLASH_ACR_WS(5) | FLASH_ACR_PRFTEN | FLASH_ACR_ICEN
|
||||
| FLASH_ACR_DCEN, &STM32_FLASH->acr);
|
||||
}
|
||||
|
||||
static void stm32_flash_lock(u8 lock)
|
||||
{
|
||||
if (lock) {
|
||||
setbits_le32(&STM32_FLASH->cr, STM32_FLASH_CR_LOCK);
|
||||
|
@ -36,7 +37,7 @@ unsigned long flash_init(void)
|
|||
u8 i, j;
|
||||
|
||||
for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) {
|
||||
flash_info[i].flash_id = FLASH_STM32F4;
|
||||
flash_info[i].flash_id = FLASH_STM32;
|
||||
flash_info[i].sector_count = CONFIG_SYS_MAX_FLASH_SECT;
|
||||
flash_info[i].start[0] = CONFIG_SYS_FLASH_BASE + (i << 20);
|
||||
flash_info[i].size = sect_sz_kb[0];
|
||||
|
@ -58,8 +59,8 @@ void flash_print_info(flash_info_t *info)
|
|||
if (info->flash_id == FLASH_UNKNOWN) {
|
||||
printf("missing or unknown FLASH type\n");
|
||||
return;
|
||||
} else if (info->flash_id == FLASH_STM32F4) {
|
||||
printf("STM32F4 Embedded Flash\n");
|
||||
} else if (info->flash_id == FLASH_STM32) {
|
||||
printf("stm32 Embedded Flash\n");
|
||||
}
|
||||
|
||||
printf(" Size: %ld MB in %d Sectors\n",
|
||||
|
@ -91,7 +92,7 @@ int flash_erase(flash_info_t *info, int first, int last)
|
|||
if (bank == 0xFF)
|
||||
return -1;
|
||||
|
||||
stm32f4_flash_lock(0);
|
||||
stm32_flash_lock(0);
|
||||
|
||||
for (i = first; i <= last; i++) {
|
||||
while (readl(&STM32_FLASH->sr) & STM32_FLASH_SR_BSY)
|
||||
|
@ -107,7 +108,7 @@ int flash_erase(flash_info_t *info, int first, int last)
|
|||
setbits_le32(&STM32_FLASH->cr,
|
||||
((0x10 | i) << STM32_FLASH_CR_SNB_OFFSET));
|
||||
} else {
|
||||
stm32f4_flash_lock(1);
|
||||
stm32_flash_lock(1);
|
||||
return -1;
|
||||
}
|
||||
setbits_le32(&STM32_FLASH->cr, STM32_FLASH_CR_SER);
|
||||
|
@ -119,7 +120,7 @@ int flash_erase(flash_info_t *info, int first, int last)
|
|||
clrbits_le32(&STM32_FLASH->cr, STM32_FLASH_CR_SER);
|
||||
}
|
||||
|
||||
stm32f4_flash_lock(1);
|
||||
stm32_flash_lock(1);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -130,7 +131,7 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
|
|||
while (readl(&STM32_FLASH->sr) & STM32_FLASH_SR_BSY)
|
||||
;
|
||||
|
||||
stm32f4_flash_lock(0);
|
||||
stm32_flash_lock(0);
|
||||
|
||||
setbits_le32(&STM32_FLASH->cr, STM32_FLASH_CR_PG);
|
||||
/* To make things simple use byte writes only */
|
||||
|
@ -140,7 +141,7 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
|
|||
;
|
||||
}
|
||||
clrbits_le32(&STM32_FLASH->cr, STM32_FLASH_CR_PG);
|
||||
stm32f4_flash_lock(1);
|
||||
stm32_flash_lock(1);
|
||||
|
||||
return 0;
|
||||
}
|
27
drivers/mtd/stm32_flash.h
Normal file
27
drivers/mtd/stm32_flash.h
Normal file
|
@ -0,0 +1,27 @@
|
|||
struct stm32_flash_regs {
|
||||
u32 acr;
|
||||
u32 key;
|
||||
u32 optkeyr;
|
||||
u32 sr;
|
||||
u32 cr;
|
||||
u32 optcr;
|
||||
u32 optcr1;
|
||||
};
|
||||
|
||||
#define STM32_FLASH_KEY1 0x45670123
|
||||
#define STM32_FLASH_KEY2 0xCDEF89AB
|
||||
|
||||
#define STM32_FLASH_SR_BSY (1 << 16)
|
||||
|
||||
#define STM32_FLASH_CR_PG (1 << 0)
|
||||
#define STM32_FLASH_CR_SER (1 << 1)
|
||||
#define STM32_FLASH_CR_STRT (1 << 16)
|
||||
#define STM32_FLASH_CR_LOCK (1 << 31)
|
||||
#define STM32_FLASH_CR_SNB_OFFSET 3
|
||||
#define STM32_FLASH_CR_SNB_MASK (15 << STM32_FLASH_CR_SNB_OFFSET)
|
||||
|
||||
/* Flash ACR: Access control register */
|
||||
#define FLASH_ACR_WS(n) n
|
||||
#define FLASH_ACR_PRFTEN (1 << 8)
|
||||
#define FLASH_ACR_ICEN (1 << 9)
|
||||
#define FLASH_ACR_DCEN (1 << 10)
|
|
@ -47,6 +47,7 @@
|
|||
#define CONFIG_GREEN_LED 109
|
||||
|
||||
#define CONFIG_STM32_GPIO
|
||||
#define CONFIG_STM32_FLASH
|
||||
#define CONFIG_STM32_SERIAL
|
||||
|
||||
#define CONFIG_STM32_HSE_HZ 8000000
|
||||
|
|
|
@ -465,7 +465,7 @@ extern flash_info_t *flash_get_info(ulong base);
|
|||
#define FLASH_S29GL064M 0x00F0 /* Spansion S29GL064M-R6 */
|
||||
#define FLASH_S29GL128N 0x00F1 /* Spansion S29GL128N */
|
||||
|
||||
#define FLASH_STM32F4 0x00F2 /* STM32F4 Embedded Flash */
|
||||
#define FLASH_STM32 0x00F2 /* STM32 Embedded Flash */
|
||||
#define FLASH_STM32F1 0x00F3 /* STM32F1 Embedded Flash */
|
||||
|
||||
#define FLASH_UNKNOWN 0xFFFF /* unknown flash type */
|
||||
|
|
Loading…
Reference in a new issue