ti816x: Import dts files from Linux Kernel v4.11

[u-boot] / drivers / gpio / vybrid_gpio.c

diff --git a/drivers/gpio/vybrid_gpio.c b/drivers/gpio/vybrid_gpio.c
index 4d25f9af4e0f63866fa3f209e1e17792c0521a77..b7a1b6a45b484ad5ed333029157e52438f6ec9ce 100644 (file)
--- a/drivers/gpio/vybrid_gpio.c
+++ b/drivers/gpio/vybrid_gpio.c
@@ -113,7 +113,7 @@ static int vybrid_gpio_bind(struct udevice *dev)
        if (plat)
                return 0;
 
-       base_addr = dev_get_addr(dev);
+       base_addr = devfdt_get_addr(dev);
        if (base_addr == FDT_ADDR_T_NONE)
                return -ENODEV;
 
@@ -129,30 +129,12 @@ static int vybrid_gpio_bind(struct udevice *dev)
 
        plat->base = base_addr;
        plat->chip = dev->req_seq;
-       plat->port_name = fdt_get_name(gd->fdt_blob, dev->of_offset, NULL);
+       plat->port_name = fdt_get_name(gd->fdt_blob, dev_of_offset(dev), NULL);
        dev->platdata = plat;
 
        return 0;
 }
 
-#if !CONFIG_IS_ENABLED(OF_CONTROL)
-static const struct vybrid_gpio_platdata vybrid_gpio[] = {
-       {0, GPIO0_BASE_ADDR, "GPIO0 "},
-       {1, GPIO1_BASE_ADDR, "GPIO1 "},
-       {2, GPIO2_BASE_ADDR, "GPIO2 "},
-       {3, GPIO3_BASE_ADDR, "GPIO3 "},
-       {4, GPIO4_BASE_ADDR, "GPIO4 "},
-};
-
-U_BOOT_DEVICES(vybrid_gpio) = {
-       { "gpio_vybrid", &vybrid_gpio[0] },
-       { "gpio_vybrid", &vybrid_gpio[1] },
-       { "gpio_vybrid", &vybrid_gpio[2] },
-       { "gpio_vybrid", &vybrid_gpio[3] },
-       { "gpio_vybrid", &vybrid_gpio[4] },
-};
-#endif
-
 static const struct udevice_id vybrid_gpio_ids[] = {
        { .compatible = "fsl,vf610-gpio" },
        { }