diff options
Diffstat (limited to 'drivers/pinctrl/pinctrl-at91-pio4.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-at91-pio4.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c index 40bc573e31..f6d40b392f 100644 --- a/drivers/pinctrl/pinctrl-at91-pio4.c +++ b/drivers/pinctrl/pinctrl-at91-pio4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * sama5d2 pin control and GPIO chip driver * Copyright (c) 2019 Ahmad Fatoum, Pengutronix @@ -11,7 +11,7 @@ #include <pinctrl.h> #include <malloc.h> #include <gpio.h> -#include <mach/gpio.h> +#include <mach/at91/gpio.h> #include <linux/clk.h> #include <dt-bindings/pinctrl/at91.h> @@ -96,8 +96,7 @@ static int __pinctrl_at91_pio4_set_state(struct pinctrl_device *pdev, npins /= sizeof(__be32); if (!npins) { - dev_err(pdev->dev, "Invalid pinmux property in %s\n", - np->full_name); + dev_err(pdev->dev, "Invalid pinmux property in %pOF\n", np); return -EINVAL; } @@ -226,7 +225,7 @@ static struct gpio_ops at91_gpio4_ops = { .set = at91_gpio4_set, }; -static int pinctrl_at91_pio4_gpiochip_add(struct device_d *dev, +static int pinctrl_at91_pio4_gpiochip_add(struct device *dev, struct pinctrl_at91_pio4 *pinctrl) { const struct at91_pinctrl_data *drvdata; @@ -269,9 +268,9 @@ static struct pinctrl_ops pinctrl_at91_pio4_ops = { .set_state = pinctrl_at91_pio4_set_state, }; -static int pinctrl_at91_pio4_probe(struct device_d *dev) +static int pinctrl_at91_pio4_probe(struct device *dev) { - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; struct pinctrl_at91_pio4 *pinctrl; struct resource *io; int ret; @@ -306,8 +305,9 @@ static __maybe_unused struct of_device_id pinctrl_at91_pio4_dt_ids[] = { { .compatible = "atmel,sama5d2-pinctrl", .data = &sama5d2_pinctrl_data }, { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, pinctrl_at91_pio4_dt_ids); -static struct driver_d pinctrl_at91_pio4_driver = { +static struct driver pinctrl_at91_pio4_driver = { .name = "pinctrl-at91-pio4", .probe = pinctrl_at91_pio4_probe, .of_compatible = DRV_OF_COMPAT(pinctrl_at91_pio4_dt_ids), |