gpio: mpc8xxx: Support controller register physical address beyond 32-bit

dev_read_addr_size_index() returns fdt_addr_t which might be a
64-bit physical address. This might be true for some 85xx SoCs
whose CCSBAR is mapped beyond 4 GiB.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>

diff --git a/arch/powerpc/include/asm/arch-mpc85xx/gpio.h b/arch/powerpc/include/asm/arch-mpc85xx/gpio.h
index c7086a8361e1ff83b40a92ffbdaf51575f9bdc24..79ba7868c26c938936ac50b9e60ae5aedadfdade 100644 (file)
--- a/arch/powerpc/include/asm/arch-mpc85xx/gpio.h
+++ b/arch/powerpc/include/asm/arch-mpc85xx/gpio.h
@@ -18,7 +18,7 @@
 #endif
 
 struct mpc8xxx_gpio_plat {
-       ulong addr;
+       phys_addr_t addr;
        unsigned long size;
        uint ngpios;
 };

diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c
index c7336032894f5b2b1fe85cfc71b5ae8cc0e564d7..f7ffd8926aded4d054536e91988b6046f04d9671 100644 (file)
--- a/drivers/gpio/mpc8xxx_gpio.c
+++ b/drivers/gpio/mpc8xxx_gpio.c
@@ -20,7 +20,7 @@ struct mpc8xxx_gpio_data {
        /* The bank's register base in memory */
        struct ccsr_gpio __iomem *base;
        /* The address of the registers; used to identify the bank */
-       ulong addr;
+       phys_addr_t addr;
        /* The GPIO count of the bank */
        uint gpio_count;
        /* The GPDAT register cannot be used to determine the value of output
@@ -181,7 +181,7 @@ static int mpc8xxx_gpio_of_to_plat(struct udevice *dev)
        if (dev_read_bool(dev, "little-endian"))
                data->little_endian = true;
 
-       plat->addr = (ulong)dev_read_addr_size_index(dev, 0, (fdt_size_t *)&plat->size);
+       plat->addr = dev_read_addr_size_index(dev, 0, (fdt_size_t *)&plat->size);
        plat->ngpios = dev_read_u32_default(dev, "ngpios", 32);
 
        return 0;
@@ -220,7 +220,8 @@ static int mpc8xxx_gpio_probe(struct udevice *dev)
 
        mpc8xxx_gpio_plat_to_priv(dev);
 
-       snprintf(name, sizeof(name), "MPC@%lx_", data->addr);
+       snprintf(name, sizeof(name), "MPC@%.8llx",
+                (unsigned long long)data->addr);
        str = strdup(name);
 
        if (!str)