diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2007-10-23 12:31:13 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2007-10-23 12:31:13 +0000 |
| commit | 71f9b205e495e01a36f17bf87a9118b414ab65c8 (patch) | |
| tree | e2e4e84934baa470c2a14f7019b32e4eb8f0f109 /target/linux/adm5120/files/drivers | |
| parent | ce9584fad9ca297268dbd3cad7e915b949219ff0 (diff) | |
| download | upstream-71f9b205e495e01a36f17bf87a9118b414ab65c8.tar.gz upstream-71f9b205e495e01a36f17bf87a9118b414ab65c8.tar.bz2 upstream-71f9b205e495e01a36f17bf87a9118b414ab65c8.zip | |
fix flash driver, it should work on RB150 as well
SVN-Revision: 9418
Diffstat (limited to 'target/linux/adm5120/files/drivers')
| -rw-r--r-- | target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c b/target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c index e07fb96d26..20f67d625f 100644 --- a/target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c +++ b/target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c @@ -244,7 +244,7 @@ static int adm5120_flash_initinfo(struct adm5120_flash_info *info, struct map_info *map = &info->amap.map; struct adm5120_flash_platform_data *pdata = dev->dev.platform_data; struct flash_desc *fdesc; - u32 t; + u32 t = 0; map->name = dev->dev.bus_id; @@ -255,12 +255,18 @@ static int adm5120_flash_initinfo(struct adm5120_flash_info *info, fdesc = &flash_descs[dev->id]; - /* get memory window size */ - t = SW_READ_REG(MEMCTRL) >> fdesc->srs_shift; - t &= MEMCTRL_SRS_MASK; - info->amap.window_size = flash_sizes[t]; + if (pdata) + info->amap.window_size = pdata->window_size; + + if (info->amap.window_size == 0) { + /* get memory window size */ + t = SW_READ_REG(MEMCTRL) >> fdesc->srs_shift; + t &= MEMCTRL_SRS_MASK; + info->amap.window_size = flash_sizes[t]; + } + if (info->amap.window_size == 0) { - MAP_ERR(map, "invalid flash size detected\n"); + MAP_ERR(map, "unable to determine window size\n"); goto err_out; } |