sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

new cfi driver: change function order to a more common one 

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2009-04-22 21:36:57 +02:00
parent 42c9801f66
commit 31c25dd6a3
1 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
drivers/nor/cfi_flash_new.c
View File

@ -490,34 +490,6 @@ static ulong flash_get_size (flash_info_t *info, ulong base)
return (info->size);
}
static int cfi_probe (struct device_d *dev)
{
unsigned long size = 0;
flash_info_t *info = malloc(sizeof(flash_info_t));
dev->priv = (void *)info;
printf("cfi_probe: %s base: 0x%08x size: 0x%08x\n", dev->name, dev->map_base, dev->size);
/* Init: no FLASHes known */
info->flash_id = FLASH_UNKNOWN;
size += info->size = flash_get_size(info, dev->map_base);
if (dev->size == 0) {
printf("cfi_probe: size : 0x%08x\n", info->size);
dev->size = info->size;
}
if (info->flash_id == FLASH_UNKNOWN) {
#ifndef CFG_FLASH_QUIET_TEST
printf ("## Unknown FLASH on Bank at 0x%08x - Size = 0x%08lx = %ld MB\n",
dev->map_base, info->size, info->size << 20);
#endif /* CFG_FLASH_QUIET_TEST */
}
return 0;
}
/* loop through the sectors from the highest address
* when the passed address is greater or equal to the sector address
* we have a match
@ -808,27 +780,6 @@ static void cfi_info (struct device_d* dev)
return;
}
static struct driver_d cfi_driver = {
.name = "cfi_flash",
.probe = cfi_probe,
.read = mem_read,
.write = cfi_write,
.lseek = dev_lseek_default,
.open = dev_open_default,
.close = dev_close_default,
.erase = cfi_erase,
.info = cfi_info,
.protect = cfi_protect,
.memmap = generic_memmap_ro,
};
static int cfi_init(void)
{
return register_driver(&cfi_driver);
}
device_initcall(cfi_init);
#if 0
/*
* flash_read_user_serial - read the OneTimeProgramming cells
@ -983,3 +934,52 @@ int flash_isset (flash_info_t * info, flash_sect_t sect, uint offset, uchar cmd)
return retval;
}
static int cfi_probe (struct device_d *dev)
{
unsigned long size = 0;
flash_info_t *info = malloc(sizeof(flash_info_t));
dev->priv = (void *)info;
printf("cfi_probe: %s base: 0x%08x size: 0x%08x\n", dev->name, dev->map_base, dev->size);
/* Init: no FLASHes known */
info->flash_id = FLASH_UNKNOWN;
size += info->size = flash_get_size(info, dev->map_base);
if (dev->size == 0) {
printf("cfi_probe: size : 0x%08x\n", info->size);
dev->size = info->size;
}
if (info->flash_id == FLASH_UNKNOWN) {
#ifndef CFG_FLASH_QUIET_TEST
printf ("## Unknown FLASH on Bank at 0x%08x - Size = 0x%08lx = %ld MB\n",
dev->map_base, info->size, info->size << 20);
#endif /* CFG_FLASH_QUIET_TEST */
}
return 0;
}
static struct driver_d cfi_driver = {
.name = "cfi_flash",
.probe = cfi_probe,
.read = mem_read,
.write = cfi_write,
.lseek = dev_lseek_default,
.open = dev_open_default,
.close = dev_close_default,
.erase = cfi_erase,
.info = cfi_info,
.protect = cfi_protect,
.memmap = generic_memmap_ro,
};
static int cfi_init(void)
{
return register_driver(&cfi_driver);
}
device_initcall(cfi_init);