diff options
| author |   Alan Ott <alan@signal11.us> | 2013-03-18 12:06:40 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-03-19 10:07:49 -0400 |
| commit | 50861c7effcad107826e49e6077e64b666c2dc3f (patch) | |
| tree | 2eb63432917291a7c5b9d6a40eba861662d93845 /drivers | |
| parent | can: dump stack on protocol bugs (diff) | |
| download | linux-dev-50861c7effcad107826e49e6077e64b666c2dc3f.tar.xz linux-dev-50861c7effcad107826e49e6077e64b666c2dc3f.zip | |
mrf24j40: pinctrl support
Activate pinctrl settings when used with a DT system.
Signed-off-by: Alan Ott <alan@signal11.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ieee802154/mrf24j40.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c index 3f2c7aaf28c4..3106895e8b91 100644 --- a/drivers/net/ieee802154/mrf24j40.c +++ b/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; |