Merge branch 'master' of git://git.denx.de/u-boot-video

[u-boot] / drivers / pinctrl / pinctrl-at91-pio4.c

diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index 6d4aadc32c0bcfb64b36df96cdc877bb4e073fb1..0c43686e01cc5895912ac2a399ea19d8b691bfa8 100644 (file)
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -1,14 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Atmel PIO4 pinctrl driver
  *
  * Copyright (C) 2016 Atmel Corporation
  *               Wenyou.Yang <wenyou.yang@atmel.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
-#include <dm/device.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
 #include <linux/io.h>
 #include <linux/err.h>
@@ -109,7 +108,7 @@ static int atmel_pinctrl_set_state(struct udevice *dev, struct udevice *config)
 {
        struct atmel_pio4_port *bank_base;
        const void *blob = gd->fdt_blob;
-       int node = config->of_offset;
+       int node = dev_of_offset(config);
        u32 offset, func, bank, line;
        u32 cells[MAX_PINMUX_ENTRIES];
        u32 i, conf;
@@ -158,7 +157,7 @@ static int atmel_pinctrl_probe(struct udevice *dev)
        fdt_addr_t addr_base;
 
        dev = dev_get_parent(dev);
-       addr_base = dev_get_addr(dev);
+       addr_base = devfdt_get_addr(dev);
        if (addr_base == FDT_ADDR_T_NONE)
                return -EINVAL;