Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-29 08:01:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

onenand_spl_simple: Add DDP OneNAND support

Browse source 
Current implementation is unable to access second half of
DDP OneNAND flash (reads first half mirrored). Use block
and bufferram address calculations from onenand_base to
fix this.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
This commit is contained in:
Ladislav Michl 2017-06-20 11:44:29 +02:00 committed by Tom Rini
parent 0da008ef8d
commit b51ced8e2a
1 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
drivers/mtd/onenand/onenand_spl.c
View file

@ -23,11 +23,29 @@ enum onenand_spl_pagesize {
PAGE_4K = 4096, PAGE_4K = 4096,
}; };
static unsigned int density_mask;
#define ONENAND_PAGES_PER_BLOCK 64 #define ONENAND_PAGES_PER_BLOCK 64
#define onenand_block_address(block) (block)
#define onenand_sector_address(page) (page << 2) #define onenand_sector_address(page) (page << 2)
#define onenand_buffer_address() ((1 << 3) << 8) #define onenand_buffer_address() ((1 << 3) << 8)
#define onenand_bufferram_address(block) (0)
static inline int onenand_block_address(int block)
{
/* Device Flash Core select, NAND Flash Block Address */
if (block & density_mask)
return ONENAND_DDP_CHIP1 | (block ^ density_mask);
return block;
}
static inline int onenand_bufferram_address(int block)
{
/* Device BufferRAM Select */
if (block & density_mask)
return ONENAND_DDP_CHIP1;
return ONENAND_DDP_CHIP0;
}
static inline uint16_t onenand_readw(uint32_t addr) static inline uint16_t onenand_readw(uint32_t addr)
{ {
@ -41,7 +59,7 @@ static inline void onenand_writew(uint16_t value, uint32_t addr)
static enum onenand_spl_pagesize onenand_spl_get_geometry(void) static enum onenand_spl_pagesize onenand_spl_get_geometry(void)
{ {
uint32_t dev_id, density; unsigned int dev_id, density, size;
if (!onenand_readw(ONENAND_REG_TECHNOLOGY)) { if (!onenand_readw(ONENAND_REG_TECHNOLOGY)) {
dev_id = onenand_readw(ONENAND_REG_DEVICE_ID); dev_id = onenand_readw(ONENAND_REG_DEVICE_ID);
@ -51,8 +69,11 @@ static enum onenand_spl_pagesize onenand_spl_get_geometry(void)
if (density < ONENAND_DEVICE_DENSITY_4Gb) if (density < ONENAND_DEVICE_DENSITY_4Gb)
return PAGE_2K; return PAGE_2K;
if (dev_id & ONENAND_DEVICE_IS_DDP) if (dev_id & ONENAND_DEVICE_IS_DDP) {
size = onenand_readw(ONENAND_REG_DATA_BUFFER_SIZE);
density_mask = 1 << (18 + density - ffs(size));
return PAGE_2K; return PAGE_2K;
}
} }
return PAGE_4K; return PAGE_4K;