diff options
Diffstat (limited to 'drivers/pinctrl/pinctrl-vf610.c')
-rw-r--r-- | drivers/pinctrl/pinctrl-vf610.c | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/drivers/pinctrl/pinctrl-vf610.c b/drivers/pinctrl/pinctrl-vf610.c index 662fa9b6c9..ada0e28751 100644 --- a/drivers/pinctrl/pinctrl-vf610.c +++ b/drivers/pinctrl/pinctrl-vf610.c @@ -1,19 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2016 Zodiac Inflight Innovation * Author: Andrey Smirnov <andrew.smirnov@gmail.com> - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * */ #include <common.h> @@ -24,7 +12,7 @@ #include <malloc.h> #include <gpio.h> -#include <mach/iomux-vf610.h> +#include <mach/imx/iomux-vf610.h> enum { PINCTRL_VF610_MUX_LINE_SIZE = 20, @@ -53,8 +41,7 @@ static int pinctrl_vf610_set_state(struct pinctrl_device *pdev, return -EINVAL; if (!size || size % PINCTRL_VF610_MUX_LINE_SIZE) { - dev_err(pdev->dev, "Invalid fsl,pins property in %s\n", - np->full_name); + dev_err(pdev->dev, "Invalid fsl,pins property in %pOF\n", np); return -EINVAL; } @@ -125,7 +112,7 @@ static struct pinctrl_ops pinctrl_vf610_ops = { .get_direction = pinctrl_vf610_get_direction, }; -static int pinctrl_vf610_probe(struct device_d *dev) +static int pinctrl_vf610_probe(struct device *dev) { int ret; struct resource *io; @@ -154,15 +141,12 @@ static __maybe_unused struct of_device_id pinctrl_vf610_dt_ids[] = { { .compatible = "fsl,vf610-iomuxc", }, { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, pinctrl_vf610_dt_ids); -static struct driver_d pinctrl_vf610_driver = { +static struct driver pinctrl_vf610_driver = { .name = "vf610-pinctrl", .probe = pinctrl_vf610_probe, .of_compatible = DRV_OF_COMPAT(pinctrl_vf610_dt_ids), }; -static int pinctrl_vf610_init(void) -{ - return platform_driver_register(&pinctrl_vf610_driver); -} -core_initcall(pinctrl_vf610_init); +core_platform_driver(pinctrl_vf610_driver); |