dm: treewide: Rename dev_get_platdata() to dev_get_plat()

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

diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index 6d4aadc..9a25cfa 100644 (file)
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -1,15 +1,15 @@
+// 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/bitops.h>
 #include <linux/io.h>
 #include <linux/err.h>
 #include <mach/atmel_pio4.h>
@@ -95,7 +95,7 @@ static u32 atmel_pinctrl_get_pinconf(const void *blob, int node)
 static inline struct atmel_pio4_port *atmel_pio4_bank_base(struct udevice *dev,
                                                           u32 bank)
 {
-       struct atmel_pio4_platdata *plat = dev_get_platdata(dev);
+       struct atmel_pio4_platdata *plat = dev_get_plat(dev);
        struct atmel_pio4_port *bank_base =
                        (struct atmel_pio4_port *)((u32)plat->reg_base +
                        ATMEL_PIO_BANK_OFFSET * bank);
@@ -109,7 +109,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;
@@ -154,11 +154,11 @@ const struct pinctrl_ops atmel_pinctrl_ops  = {
 
 static int atmel_pinctrl_probe(struct udevice *dev)
 {
-       struct atmel_pio4_platdata *plat = dev_get_platdata(dev);
+       struct atmel_pio4_platdata *plat = dev_get_plat(dev);
        fdt_addr_t addr_base;
 
        dev = dev_get_parent(dev);
-       addr_base = dev_get_addr(dev);
+       addr_base = dev_read_addr(dev);
        if (addr_base == FDT_ADDR_T_NONE)
                return -EINVAL;
 
@@ -169,6 +169,7 @@ static int atmel_pinctrl_probe(struct udevice *dev)
 
 static const struct udevice_id atmel_pinctrl_match[] = {
        { .compatible = "atmel,sama5d2-pinctrl" },
+       { .compatible = "microchip,sama7g5-pinctrl" },
        {}
 };
 
@@ -177,6 +178,6 @@ U_BOOT_DRIVER(atmel_pinctrl) = {
        .id = UCLASS_PINCTRL,
        .of_match = atmel_pinctrl_match,
        .probe = atmel_pinctrl_probe,
-       .platdata_auto_alloc_size = sizeof(struct atmel_pio4_platdata),
+       .plat_auto      = sizeof(struct atmel_pio4_platdata),
        .ops = &atmel_pinctrl_ops,
 };