Skip to contentSkip to conversation

spi: cadence_qspi: remap iomem registers instead of just mapping

PATCH New Ramon Fried 2 participants 2 messages Dec 19, 2018 – Dec 23, 2018 SPI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 spi: cadence_qspi: remap iomem registers instead of just mapping

Some architectures(MIPS) requires real mapping of IOMEM, other just define it as identity mapping. fix it.

---
 drivers/spi/cadence_qspi.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/spi/cadence_qspi.c +4 -2
index 11fce9c..3ae1526 100644
@@ -284,8 +284,10 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus)
 	int node = dev_of_offset(bus);
 	int subnode;
 
-	plat->regbase = (void *)devfdt_get_addr_index(bus, 0);
-	plat->ahbbase = (void *)devfdt_get_addr_index(bus, 1);
+	plat->regbase = (void *)dev_remap_addr_index(bus, 0);
+	plat->ahbbase = (void *)dev_remap_addr_index(bus, 1);
+	if (!plat->regbase || !plat->ahbbase)
+		return -EFAULT;
 	plat->is_decoded_cs = fdtdec_get_bool(blob, node, "cdns,is-decoded-cs");
 	plat->fifo_depth = fdtdec_get_uint(blob, node, "cdns,fifo-depth", 128);
 	plat->fifo_width = fdtdec_get_uint(blob, node, "cdns,fifo-width", 4);
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 spi: cadence_qspi: remap iomem registers instead of just mapping

Quoted 3 lines · Ramon Fried

Some architectures(MIPS) requires real mapping of IOMEM, other just define it as identity mapping. fix it.

Hope it wouldn't break anything, will push after release?

Quoted 2 lines