diff options
Diffstat (limited to 'drivers/bus')
-rw-r--r-- | drivers/bus/mips_cdmm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bus/mips_cdmm.c b/drivers/bus/mips_cdmm.c index 5bd792c68f9b..ab3bde16ecb4 100644 --- a/drivers/bus/mips_cdmm.c +++ b/drivers/bus/mips_cdmm.c | |||
@@ -453,7 +453,7 @@ void __iomem *mips_cdmm_early_probe(unsigned int dev_type) | |||
453 | 453 | ||
454 | /* Look for a specific device type */ | 454 | /* Look for a specific device type */ |
455 | for (; drb < bus->drbs; drb += size + 1) { | 455 | for (; drb < bus->drbs; drb += size + 1) { |
456 | acsr = readl(cdmm + drb * CDMM_DRB_SIZE); | 456 | acsr = __raw_readl(cdmm + drb * CDMM_DRB_SIZE); |
457 | type = (acsr & CDMM_ACSR_DEVTYPE) >> CDMM_ACSR_DEVTYPE_SHIFT; | 457 | type = (acsr & CDMM_ACSR_DEVTYPE) >> CDMM_ACSR_DEVTYPE_SHIFT; |
458 | if (type == dev_type) | 458 | if (type == dev_type) |
459 | return cdmm + drb * CDMM_DRB_SIZE; | 459 | return cdmm + drb * CDMM_DRB_SIZE; |
@@ -500,7 +500,7 @@ static void mips_cdmm_bus_discover(struct mips_cdmm_bus *bus) | |||
500 | bus->discovered = true; | 500 | bus->discovered = true; |
501 | pr_info("cdmm%u discovery (%u blocks)\n", cpu, bus->drbs); | 501 | pr_info("cdmm%u discovery (%u blocks)\n", cpu, bus->drbs); |
502 | for (; drb < bus->drbs; drb += size + 1) { | 502 | for (; drb < bus->drbs; drb += size + 1) { |
503 | acsr = readl(cdmm + drb * CDMM_DRB_SIZE); | 503 | acsr = __raw_readl(cdmm + drb * CDMM_DRB_SIZE); |
504 | type = (acsr & CDMM_ACSR_DEVTYPE) >> CDMM_ACSR_DEVTYPE_SHIFT; | 504 | type = (acsr & CDMM_ACSR_DEVTYPE) >> CDMM_ACSR_DEVTYPE_SHIFT; |
505 | size = (acsr & CDMM_ACSR_DEVSIZE) >> CDMM_ACSR_DEVSIZE_SHIFT; | 505 | size = (acsr & CDMM_ACSR_DEVSIZE) >> CDMM_ACSR_DEVSIZE_SHIFT; |
506 | rev = (acsr & CDMM_ACSR_DEVREV) >> CDMM_ACSR_DEVREV_SHIFT; | 506 | rev = (acsr & CDMM_ACSR_DEVREV) >> CDMM_ACSR_DEVREV_SHIFT; |