[PATCH Resend v5 12/16] spi/spi-atmel: add pinctrl support for atmel spi
From: Joachim Eastwood <hidden>
Date: 2013-02-27 19:26:42
Also in:
linux-spi, lkml
On 27 February 2013 01:47, Wenyou Yang [off-list ref] wrote:
quoted hunk ↗ jump to hunk
Signed-off-by: Wenyou Yang <redacted> Cc: spi-devel-general at lists.sourceforge.net Cc: linux-kernel at vger.kernel.org --- drivers/spi/spi-atmel.c | 8 ++++++++ 1 file changed, 8 insertions(+)diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index 00ca85f..0ed3e1a 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c@@ -23,6 +23,7 @@ #include <linux/platform_data/atmel.h> #include <linux/platform_data/dma-atmel.h> #include <linux/of.h> +#include <linux/pinctrl/consumer.h> #include <asm/io.h> #include <asm/gpio.h>@@ -1503,11 +1504,18 @@ static int atmel_spi_probe(struct platform_device *pdev) int ret; struct spi_master *master; struct atmel_spi *as; + struct pinctrl *pinctrl; regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!regs) return -ENXIO; + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); + if (IS_ERR(pinctrl)) { + dev_err(&pdev->dev, "Failed to request pinctrl\n"); + return PTR_ERR(pinctrl); + } +
This patch should be dropped since driver core will now do this for us. regards Joachim Eastwood