dm: treewide: Rename auto_alloc_size members to be shorter

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

diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c
index 0a50c68..507f8b1 100644 (file)
--- a/drivers/gpio/da8xx_gpio.c
+++ b/drivers/gpio/da8xx_gpio.c
@@ -9,13 +9,14 @@
 #include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <malloc.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <dt-bindings/gpio/gpio.h>
 
 #include "da8xx_gpio.h"
 
-#ifndef CONFIG_DM_GPIO
+#if !CONFIG_IS_ENABLED(DM_GPIO)
 #include <asm/arch/hardware.h>
 #include <asm/arch/davinci_misc.h>
 
@@ -377,7 +378,8 @@ static int _gpio_direction_output(struct davinci_gpio *bank, unsigned int gpio,
        _gpio_set_value(bank, gpio, value);
        return 0;
 }
-#ifndef CONFIG_DM_GPIO
+
+#if !CONFIG_IS_ENABLED(DM_GPIO)
 
 void gpio_info(void)
 {
@@ -428,12 +430,12 @@ int gpio_set_value(unsigned int gpio, int value)
        return _gpio_set_value(bank, gpio, value);
 }
 
-#else /* CONFIG_DM_GPIO */
+#else /* DM_GPIO */
 
 static struct davinci_gpio *davinci_get_gpio_bank(struct udevice *dev, unsigned int offset)
 {
        struct davinci_gpio_bank *bank = dev_get_priv(dev);
-       unsigned int addr;
+       unsigned long addr;
 
        /*
         * The device tree is not broken into banks but the infrastructure is
@@ -534,6 +536,7 @@ static int davinci_gpio_probe(struct udevice *dev)
 static const struct udevice_id davinci_gpio_ids[] = {
        { .compatible = "ti,dm6441-gpio" },
        { .compatible = "ti,k2g-gpio" },
+       { .compatible = "ti,keystone-gpio" },
        { }
 };
 
@@ -542,7 +545,7 @@ static int davinci_gpio_ofdata_to_platdata(struct udevice *dev)
        struct davinci_gpio_platdata *plat = dev_get_platdata(dev);
        fdt_addr_t addr;
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
@@ -550,16 +553,16 @@ static int davinci_gpio_ofdata_to_platdata(struct udevice *dev)
        return 0;
 }
 
-U_BOOT_DRIVER(gpio_davinci) = {
-       .name   = "gpio_davinci",
+U_BOOT_DRIVER(ti_dm6441_gpio) = {
+       .name   = "ti_dm6441_gpio",
        .id     = UCLASS_GPIO,
        .ops    = &gpio_davinci_ops,
        .ofdata_to_platdata = of_match_ptr(davinci_gpio_ofdata_to_platdata),
        .of_match = davinci_gpio_ids,
        .bind   = dm_scan_fdt_dev,
-       .platdata_auto_alloc_size = sizeof(struct davinci_gpio_platdata),
+       .platdata_auto  = sizeof(struct davinci_gpio_platdata),
        .probe  = davinci_gpio_probe,
-       .priv_auto_alloc_size = sizeof(struct davinci_gpio_bank),
+       .priv_auto      = sizeof(struct davinci_gpio_bank),
 };
 
 #endif