summaryrefslogtreecommitdiff
path: root/drivers/mtd/devices/bcm47xxsflash.h
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2016-02-26 11:50:28 +0100
committerBrian Norris <computersforpeace@gmail.com>2016-04-04 00:07:57 -0700
commit5651d6aaf489d1db48c253cf884b40214e91c2c5 (patch)
treeda4bc73c1d32f47829974ab4fce280d99f6e28bb /drivers/mtd/devices/bcm47xxsflash.h
parentfddcca5107051adf9e4481d2a79ae0616577fd2c (diff)
mtd: bcm47xxsflash: use ioremap_cache() instead of KSEG0ADDR()
Using KSEG0ADDR makes code highly MIPS dependent and not portable. Thanks to the fix a68f376 ("MIPS: io.h: Define `ioremap_cache'") we can use ioremap_cache which is generic and supported on MIPS as well now. KSEG0ADDR was translating 0x1c000000 into 0x9c000000. With ioremap_cache we use MIPS's __ioremap (and then remap_area_pages). This results in different address (e.g. 0xc0080000) but it still should be cached as expected and it was successfully tested with BCM47186B0. Other than that drivers/bcma/driver_chipcommon_sflash.c nicely setups a struct resource for access window, but we wren't using it. Use it now and drop duplicated info. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Diffstat (limited to 'drivers/mtd/devices/bcm47xxsflash.h')
-rw-r--r--drivers/mtd/devices/bcm47xxsflash.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/devices/bcm47xxsflash.h b/drivers/mtd/devices/bcm47xxsflash.h
index fe93daf4f489..1564b62b412e 100644
--- a/drivers/mtd/devices/bcm47xxsflash.h
+++ b/drivers/mtd/devices/bcm47xxsflash.h
@@ -65,7 +65,8 @@ struct bcm47xxsflash {
enum bcm47xxsflash_type type;
- u32 window;
+ void __iomem *window;
+
u32 blocksize;
u16 numblocks;
u32 size;