From b9e4ebc3297b0e6e7549a66a707366cbc0853bde Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Sun, 4 Nov 2012 21:34:52 +0000
Subject: [PATCH] --- yaml --- r: 340656 b: refs/heads/master c:
 dea09247b46687ff6e46fc4b50988537d01c8e64 h: refs/heads/master v: v3

---
 [refs]                                          |  2 +-
 trunk/drivers/net/ethernet/cadence/at91_ether.c | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a4a7dfd8c3d5..93a1c02c8ef3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96f6360c5a0c20fd3e006c3030aac0d1addbe3d9
+refs/heads/master: dea09247b46687ff6e46fc4b50988537d01c8e64
diff --git a/trunk/drivers/net/ethernet/cadence/at91_ether.c b/trunk/drivers/net/ethernet/cadence/at91_ether.c
index 039e7ef6c50e..6eb928ea276d 100644
--- a/trunk/drivers/net/ethernet/cadence/at91_ether.c
+++ b/trunk/drivers/net/ethernet/cadence/at91_ether.c
@@ -34,6 +34,7 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_net.h>
+#include <linux/pinctrl/consumer.h>
 
 #include "macb.h"
 
@@ -501,11 +502,21 @@ static int __init at91ether_probe(struct platform_device *pdev)
 	struct phy_device *phydev;
 	struct macb *lp;
 	int res;
+	struct pinctrl *pinctrl;
 
 	regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!regs)
 		return -ENOENT;
 
+	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+	if (IS_ERR(pinctrl)) {
+		res = PTR_ERR(pinctrl);
+		if (res == -EPROBE_DEFER)
+			return res;
+
+		dev_warn(&pdev->dev, "No pinctrl provided\n");
+	}
+
 	dev = alloc_etherdev(sizeof(struct macb));
 	if (!dev)
 		return -ENOMEM;