diff options
Diffstat (limited to 'drivers/pinctrl/pinctrl-imx.c')
-rw-r--r-- | drivers/pinctrl/pinctrl-imx.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/pinctrl/pinctrl-imx.c b/drivers/pinctrl/pinctrl-imx.c index 131d86d7c2a5..43a6f1ffc786 100644 --- a/drivers/pinctrl/pinctrl-imx.c +++ b/drivers/pinctrl/pinctrl-imx.c | |||
@@ -425,10 +425,10 @@ static int imx_pinctrl_get_pin_id_and_mux(const struct imx_pinctrl_soc_info *inf | |||
425 | return 0; | 425 | return 0; |
426 | } | 426 | } |
427 | 427 | ||
428 | static int __devinit imx_pinctrl_parse_groups(struct device_node *np, | 428 | static int imx_pinctrl_parse_groups(struct device_node *np, |
429 | struct imx_pin_group *grp, | 429 | struct imx_pin_group *grp, |
430 | struct imx_pinctrl_soc_info *info, | 430 | struct imx_pinctrl_soc_info *info, |
431 | u32 index) | 431 | u32 index) |
432 | { | 432 | { |
433 | unsigned int pin_func_id; | 433 | unsigned int pin_func_id; |
434 | int ret, size; | 434 | int ret, size; |
@@ -482,8 +482,9 @@ static int __devinit imx_pinctrl_parse_groups(struct device_node *np, | |||
482 | return 0; | 482 | return 0; |
483 | } | 483 | } |
484 | 484 | ||
485 | static int __devinit imx_pinctrl_parse_functions(struct device_node *np, | 485 | static int imx_pinctrl_parse_functions(struct device_node *np, |
486 | struct imx_pinctrl_soc_info *info, u32 index) | 486 | struct imx_pinctrl_soc_info *info, |
487 | u32 index) | ||
487 | { | 488 | { |
488 | struct device_node *child; | 489 | struct device_node *child; |
489 | struct imx_pmx_func *func; | 490 | struct imx_pmx_func *func; |
@@ -517,7 +518,7 @@ static int __devinit imx_pinctrl_parse_functions(struct device_node *np, | |||
517 | return 0; | 518 | return 0; |
518 | } | 519 | } |
519 | 520 | ||
520 | static int __devinit imx_pinctrl_probe_dt(struct platform_device *pdev, | 521 | static int imx_pinctrl_probe_dt(struct platform_device *pdev, |
521 | struct imx_pinctrl_soc_info *info) | 522 | struct imx_pinctrl_soc_info *info) |
522 | { | 523 | { |
523 | struct device_node *np = pdev->dev.of_node; | 524 | struct device_node *np = pdev->dev.of_node; |
@@ -560,8 +561,8 @@ static int __devinit imx_pinctrl_probe_dt(struct platform_device *pdev, | |||
560 | return 0; | 561 | return 0; |
561 | } | 562 | } |
562 | 563 | ||
563 | int __devinit imx_pinctrl_probe(struct platform_device *pdev, | 564 | int imx_pinctrl_probe(struct platform_device *pdev, |
564 | struct imx_pinctrl_soc_info *info) | 565 | struct imx_pinctrl_soc_info *info) |
565 | { | 566 | { |
566 | struct imx_pinctrl *ipctl; | 567 | struct imx_pinctrl *ipctl; |
567 | struct resource *res; | 568 | struct resource *res; |