]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
dm: ti_qspi: Fix conversion of address to a pointer
authorLokesh Vutla <lokeshvutla@ti.com>
Sat, 5 Mar 2016 11:13:06 +0000 (16:43 +0530)
committerJagan Teki <jteki@openedev.com>
Sat, 12 Mar 2016 14:25:42 +0000 (19:55 +0530)
TI QSPI driver directly typecasts fdt_addr_t to a pointer. This is
not strictly correct, as it gives a build warning when fdt_addr_t is u64.
So, use map_physmem for a proper typecasts.

This is inspired by commit 167efe01bc5a9 ("dm: ns16550: Use an address
instead of a pointer for the uart base")

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Jagan Teki <jteki@openedev.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Mugunthan V N <mugunthanvnm@ti.com>
drivers/spi/ti_qspi.c

index 409a5c41ab9f36a6e5aac45b1532aaa3fa6a5416..e69ec0d9cdee17747939bdbed029023f5d46168c 100644 (file)
@@ -534,11 +534,15 @@ static int ti_qspi_ofdata_to_platdata(struct udevice *bus)
        const void *blob = gd->fdt_blob;
        int node = bus->of_offset;
        fdt_addr_t addr;
+       void *mmap;
 
-       priv->base = (struct ti_qspi_regs *)dev_get_addr(bus);
-       priv->memory_map = (void *)dev_get_addr_index(bus, 1);
+       priv->base = map_physmem(dev_get_addr(bus), sizeof(struct ti_qspi_regs),
+                                MAP_NOCACHE);
+       priv->memory_map = map_physmem(dev_get_addr_index(bus, 1), 0,
+                                      MAP_NOCACHE);
        addr = dev_get_addr_index(bus, 2);
-       priv->ctrl_mod_mmap = (addr == FDT_ADDR_T_NONE) ? NULL : (void *)addr;
+       mmap = map_physmem(dev_get_addr_index(bus, 2), 0, MAP_NOCACHE);
+       priv->ctrl_mod_mmap = (addr == FDT_ADDR_T_NONE) ? NULL : mmap;
 
        priv->max_hz = fdtdec_get_int(blob, node, "spi-max-frequency", -1);
        if (priv->max_hz < 0) {