diff options
Diffstat (limited to 'drivers/pinctrl/imx-iomux-v1.c')
| -rw-r--r-- | drivers/pinctrl/imx-iomux-v1.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/drivers/pinctrl/imx-iomux-v1.c b/drivers/pinctrl/imx-iomux-v1.c index d48707db7d..a0878fa9eb 100644 --- a/drivers/pinctrl/imx-iomux-v1.c +++ b/drivers/pinctrl/imx-iomux-v1.c @@ -1,9 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only #include <common.h> #include <io.h> #include <init.h> #include <malloc.h> #include <pinctrl.h> -#include <mach/iomux-v1.h> +#include <mach/imx/iomux-v1.h> #include <linux/err.h> /* @@ -205,7 +206,7 @@ static int imx_iomux_v1_set_state(struct pinctrl_device *pdev, struct device_nod const __be32 *list; int npins, size, i; - dev_dbg(iomux->pinctrl.dev, "set state: %s\n", np->full_name); + dev_dbg(iomux->pinctrl.dev, "set state: %pOF\n", np); list = of_get_property(np, "fsl,pins", &size); if (!list) @@ -224,8 +225,8 @@ static int imx_iomux_v1_set_state(struct pinctrl_device *pdev, struct device_nod unsigned int gpio_iconfa = MX1_MUX_ICONFA(mux); unsigned int gpio_iconfb = MX1_MUX_ICONFB(mux); - dev_dbg(pdev->dev, "%s, pin 0x%x, function %d, gpio %d, direction %d, oconf %d, iconfa %d, iconfb %d\n", - np->full_name, pin_id, afunction, gpio_in_use, + dev_dbg(pdev->dev, "%pOF, pin 0x%x, function %d, gpio %d, direction %d, oconf %d, iconfa %d, iconfb %d\n", + np, pin_id, afunction, gpio_in_use, direction, gpio_oconf, gpio_iconfa, gpio_iconfb); @@ -250,7 +251,7 @@ static struct pinctrl_ops imx_iomux_v1_ops = { .set_state = imx_iomux_v1_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_v1 *iomux; int ret; @@ -269,7 +270,7 @@ static int imx_pinctrl_dt(struct device_d *dev, void __iomem *base) return ret; } -static int imx_iomux_v1_probe(struct device_d *dev) +static int imx_iomux_v1_probe(struct device *dev) { int ret = 0; void __iomem *base; @@ -278,9 +279,9 @@ static int imx_iomux_v1_probe(struct device_d *dev) if (IS_ERR(base)) return PTR_ERR(base); - ret = of_platform_populate(dev->device_node, NULL, NULL); + ret = of_platform_populate(dev->of_node, NULL, NULL); - if (IS_ENABLED(CONFIG_PINCTRL) && dev->device_node) + if (IS_ENABLED(CONFIG_PINCTRL) && dev->of_node) ret = imx_pinctrl_dt(dev, base); return ret; @@ -295,8 +296,9 @@ static __maybe_unused struct of_device_id imx_iomux_v1_dt_ids[] = { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, imx_iomux_v1_dt_ids); -static struct driver_d imx_iomux_v1_driver = { +static struct driver imx_iomux_v1_driver = { .name = "imx-iomuxv1", .probe = imx_iomux_v1_probe, .of_compatible = DRV_OF_COMPAT(imx_iomux_v1_dt_ids), |