From 604300327e6179512f7bccaa9ca85946eb7d794e Mon Sep 17 00:00:00 2001
From: Alan Ott <alan@signal11.us>
Date: Mon, 18 Mar 2013 12:06:40 +0000
Subject: [PATCH] --- yaml --- r: 368311 b: refs/heads/master c:
 50861c7effcad107826e49e6077e64b666c2dc3f h: refs/heads/master i:   368309:
 c4edf0fb740a5ef46eaacd92bfa1b14820bddea5   368307:
 bdbd87e1a8bba09d3757ec9461ec4e0171fb48f0   368303:
 7f31c8232790aff926ad39a56eb45b53e6ae2595 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/net/ieee802154/mrf24j40.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 905fc2646d8a..7adbdd45f695 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9bbb75f1dffef0e6ac47abf32cdb668d5e1a867
+refs/heads/master: 50861c7effcad107826e49e6077e64b666c2dc3f
diff --git a/trunk/drivers/net/ieee802154/mrf24j40.c b/trunk/drivers/net/ieee802154/mrf24j40.c
index 3f2c7aaf28c4..3106895e8b91 100644
--- a/trunk/drivers/net/ieee802154/mrf24j40.c
+++ b/trunk/drivers/net/ieee802154/mrf24j40.c
@@ -22,6 +22,7 @@
 #include <linux/spi/spi.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
+#include <linux/pinctrl/consumer.h>
 #include <net/wpan-phy.h>
 #include <net/mac802154.h>
 
@@ -623,6 +624,7 @@ static int mrf24j40_probe(struct spi_device *spi)
 	int ret = -ENOMEM;
 	u8 val;
 	struct mrf24j40 *devrec;
+	struct pinctrl *pinctrl;
 
 	printk(KERN_INFO "mrf24j40: probe(). IRQ: %d\n", spi->irq);
 
@@ -633,6 +635,11 @@ static int mrf24j40_probe(struct spi_device *spi)
 	if (!devrec->buf)
 		goto err_buf;
 
+	pinctrl = devm_pinctrl_get_select_default(&spi->dev);
+	if (IS_ERR(pinctrl))
+		dev_warn(&spi->dev,
+			"pinctrl pins are not configured from the driver");
+
 	spi->mode = SPI_MODE_0; /* TODO: Is this appropriate for right here? */
 	if (spi->max_speed_hz > MAX_SPI_SPEED_HZ)
 		spi->max_speed_hz = MAX_SPI_SPEED_HZ;