Merge tag 'tpm-for_tom-13062023' of https://source.denx.de/u-boot/custodians/u-boot...

[platform/kernel/u-boot.git] / drivers / gpio / octeon_gpio.c

diff --git a/drivers/gpio/octeon_gpio.c b/drivers/gpio/octeon_gpio.c
index 45acaad..2b2465b 100644 (file)
--- a/drivers/gpio/octeon_gpio.c
+++ b/drivers/gpio/octeon_gpio.c
@@ -183,14 +183,14 @@ static int octeon_gpio_probe(struct udevice *dev)
        priv->data = (const struct octeon_gpio_data *)dev_get_driver_data(dev);
 
        if (priv->data->probe == PROBE_PCI) {
-               priv->base = dm_pci_map_bar(dev, PCI_BASE_ADDRESS_0,
+               priv->base = dm_pci_map_bar(dev, PCI_BASE_ADDRESS_0, 0, 0, PCI_REGION_TYPE,
                                            PCI_REGION_MEM);
                uc_priv->gpio_count = readq(priv->base +
                                            priv->data->reg_offs + GPIO_CONST) &
                        GPIO_CONST_GPIOS_MASK;
        } else {
                priv->base = dev_remap_addr(dev);
-               uc_priv->gpio_count = ofnode_read_u32_default(dev->node,
+               uc_priv->gpio_count = ofnode_read_u32_default(dev_ofnode(dev),
                                                              "nr-gpios", 32);
        }
 
@@ -202,7 +202,7 @@ static int octeon_gpio_probe(struct udevice *dev)
 
        uc_priv->bank_name  = strdup(dev->name);
        end = strchr(uc_priv->bank_name, '@');
-       end[0] = 'A' + dev->seq;
+       end[0] = 'A' + dev_seq(dev);
        end[1] = '\0';
 
        debug("%s(%s): base address: %p, pin count: %d\n",
@@ -236,7 +236,7 @@ U_BOOT_DRIVER(octeon_gpio) = {
        .id     = UCLASS_GPIO,
        .of_match = of_match_ptr(octeon_gpio_ids),
        .probe = octeon_gpio_probe,
-       .priv_auto_alloc_size = sizeof(struct octeon_gpio),
+       .priv_auto      = sizeof(struct octeon_gpio),
        .ops    = &octeon_gpio_ops,
        .flags  = DM_FLAG_PRE_RELOC,
 };