diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2012-12-13 19:40:13 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-12-13 19:40:13 +0100 |
| commit | 241738bd51cb0efe58e6c570223153e970afe3ae (patch) | |
| tree | 05263e1ec3fbd58cc4ba5ee69163612fbb769a4a /arch/mips/cavium-octeon | |
| parent | bdf20507da11a9a5b32ef04fa09f352828189aef (diff) | |
| parent | ce8f0d0607bcad3ec0e8599be80353204427093e (diff) | |
| download | blackbird-op-linux-241738bd51cb0efe58e6c570223153e970afe3ae.tar.gz blackbird-op-linux-241738bd51cb0efe58e6c570223153e970afe3ae.zip | |
Merge branch 'mips-next' of http://dev.phrozen.org/githttp/mips-next into mips-for-linux-next
Diffstat (limited to 'arch/mips/cavium-octeon')
| -rw-r--r-- | arch/mips/cavium-octeon/flash_setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/cavium-octeon/flash_setup.c b/arch/mips/cavium-octeon/flash_setup.c index e44a55bc7f0d..237e5b1a72d8 100644 --- a/arch/mips/cavium-octeon/flash_setup.c +++ b/arch/mips/cavium-octeon/flash_setup.c @@ -51,7 +51,8 @@ static int __init flash_init(void) flash_map.name = "phys_mapped_flash"; flash_map.phys = region_cfg.s.base << 16; flash_map.size = 0x1fc00000 - flash_map.phys; - flash_map.bankwidth = 1; + /* 8-bit bus (0 + 1) or 16-bit bus (1 + 1) */ + flash_map.bankwidth = region_cfg.s.width + 1; flash_map.virt = ioremap(flash_map.phys, flash_map.size); pr_notice("Bootbus flash: Setting flash for %luMB flash at " "0x%08llx\n", flash_map.size >> 20, flash_map.phys); |
