diff options
Diffstat (limited to 'drivers/pinctrl/imx-iomux-v3.c')
| -rw-r--r-- | drivers/pinctrl/imx-iomux-v3.c | 48 |
1 files changed, 19 insertions, 29 deletions
diff --git a/drivers/pinctrl/imx-iomux-v3.c b/drivers/pinctrl/imx-iomux-v3.c index dccf7d10df..673674c1dc 100644 --- a/drivers/pinctrl/imx-iomux-v3.c +++ b/drivers/pinctrl/imx-iomux-v3.c @@ -1,20 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * imx-iomux-v3.c - i.MX iomux-v3 pinctrl support * * Copyright (c) 2013 Sascha Hauer <s.hauer@pengutronix.de> - * - * 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> @@ -23,8 +11,8 @@ #include <of.h> #include <pinctrl.h> #include <malloc.h> -#include <mach/iomux-v3.h> -#include <mach/generic.h> +#include <mach/imx/iomux-v3.h> +#include <mach/imx/generic.h> struct imx_iomux_v3 { void __iomem *base; @@ -89,7 +77,7 @@ static int imx_iomux_v3_set_state(struct pinctrl_device *pdev, struct device_nod const char *name; u32 share_conf_val = 0; - dev_dbg(iomux->pinctrl.dev, "set state: %s\n", np->full_name); + dev_dbg(iomux->pinctrl.dev, "set state: %pOF\n", np); if (share_conf) { u32 drive_strength, slew_rate; @@ -132,8 +120,7 @@ static int imx_iomux_v3_set_state(struct pinctrl_device *pdev, struct device_nod return -EINVAL; if (!size || size % fsl_pin_size) { - dev_err(iomux->pinctrl.dev, "Invalid fsl,pins property in %s\n", - np->full_name); + dev_err(iomux->pinctrl.dev, "Invalid fsl,pins property in %pOF\n", np); return -EINVAL; } @@ -168,13 +155,13 @@ static struct pinctrl_ops imx_iomux_v3_ops = { .set_state = imx_iomux_v3_set_state, }; -static int imx_pinctrl_dt(struct device_d *dev, void __iomem *base) +static int imx_pinctrl_dt(struct device *dev, void __iomem *base) { struct imx_iomux_v3 *iomux; - struct imx_iomux_v3_data *drvdata = NULL; + const struct imx_iomux_v3_data *drvdata; int ret; - dev_get_drvdata(dev, (const void **)&drvdata); + drvdata = device_get_match_data(dev); iomux = xzalloc(sizeof(*iomux)); iomux->base = base; @@ -191,7 +178,7 @@ static int imx_pinctrl_dt(struct device_d *dev, void __iomem *base) return ret; } -static int imx_iomux_v3_probe(struct device_d *dev) +static int imx_iomux_v3_probe(struct device *dev) { void __iomem *base; struct resource *iores; @@ -210,7 +197,7 @@ static int imx_iomux_v3_probe(struct device_d *dev) */ iomuxv3_base = base; - if (IS_ENABLED(CONFIG_PINCTRL) && dev->device_node) + if (IS_ENABLED(CONFIG_PINCTRL) && dev->of_node) ret = imx_pinctrl_dt(dev, base); return ret; @@ -254,20 +241,23 @@ static __maybe_unused struct of_device_id imx_iomux_v3_dt_ids[] = { }, { .compatible = "fsl,imx8mm-iomuxc", }, { + .compatible = "fsl,imx8mn-iomuxc", + }, { + .compatible = "fsl,imx8mp-iomuxc", + }, { .compatible = "fsl,imx8mq-iomuxc", }, { + .compatible = "fsl,imx93-iomuxc", + }, { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, imx_iomux_v3_dt_ids); -static struct driver_d imx_iomux_v3_driver = { +static struct driver imx_iomux_v3_driver = { .name = "imx-iomuxv3", .probe = imx_iomux_v3_probe, .of_compatible = DRV_OF_COMPAT(imx_iomux_v3_dt_ids), }; -static int imx_iomux_v3_init(void) -{ - return platform_driver_register(&imx_iomux_v3_driver); -} -core_initcall(imx_iomux_v3_init); +core_platform_driver(imx_iomux_v3_driver); |