diff options
Diffstat (limited to 'drivers/pinctrl/pinctrl-vf610.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-vf610.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/pinctrl/pinctrl-vf610.c b/drivers/pinctrl/pinctrl-vf610.c index 28474ed278..ada0e28751 100644 --- a/drivers/pinctrl/pinctrl-vf610.c +++ b/drivers/pinctrl/pinctrl-vf610.c @@ -12,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, @@ -41,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; } @@ -113,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; @@ -142,8 +141,9 @@ 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), |