[PATCH 1/1] net: macb: add pinctrl consumer support
From: Jean-Christophe PLAGNIOL-VILLARD <hidden>
Date: 2012-10-27 15:49:57
If no pinctrl available just report a warning as some architecture may not need to do anything. Cc: Nicolas Ferre <redacted> Cc: netdev at vger.kernel.org Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <redacted> --- drivers/net/ethernet/cadence/macb.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 033064b..e5fdf8a 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c@@ -26,6 +26,9 @@ #include <linux/of.h> #include <linux/of_device.h> #include <linux/of_net.h> +#include <linux/of_gpio.h> +#include <linux/gpio.h> +#include <linux/pinctrl/consumer.h> #include "macb.h"
@@ -1306,6 +1309,7 @@ static int __init macb_probe(struct platform_device *pdev) struct phy_device *phydev; u32 config; int err = -ENXIO; + struct pinctrl *pinctrl; regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!regs) {
@@ -1313,6 +1317,15 @@ static int __init macb_probe(struct platform_device *pdev) goto err_out; } + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); + if (IS_ERR(pinctrl)) { + err = PTR_ERR(pinctrl); + if (err == -EPROBE_DEFER) + return err; + + dev_warn(&pdev->dev, "No pinctrl provided\n"); + } + err = -ENOMEM; dev = alloc_etherdev(sizeof(*bp)); if (!dev)
--
1.7.10.4