* [REPOST PATCH v2 1/2] spi: omap2-mcspi: add pinctrl support
@ 2012-09-18 12:01 Matt Porter
2012-09-18 12:08 ` Shubhrajyoti
2012-09-22 16:06 ` Mark Brown
0 siblings, 2 replies; 4+ messages in thread
From: Matt Porter @ 2012-09-18 12:01 UTC (permalink / raw)
To: linux-arm-kernel
Adds pinctrl support to support OMAP platforms that boot from DT
and rely on pinctrl support to set pinmuxes.
Signed-off-by: Matt Porter <mporter@ti.com>
---
drivers/spi/spi-omap2-mcspi.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index b2fb141..9502566 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -38,6 +38,8 @@
#include <linux/pm_runtime.h>
#include <linux/of.h>
#include <linux/of_device.h>
+#include <linux/pinctrl/consumer.h>
+#include <linux/err.h>
#include <linux/spi/spi.h>
@@ -1124,6 +1126,7 @@ static int __devinit omap2_mcspi_probe(struct platform_device *pdev)
static int bus_num = 1;
struct device_node *node = pdev->dev.of_node;
const struct of_device_id *match;
+ struct pinctrl *pinctrl;
master = spi_alloc_master(&pdev->dev, sizeof *mcspi);
if (master == NULL) {
@@ -1219,6 +1222,11 @@ static int __devinit omap2_mcspi_probe(struct platform_device *pdev)
if (status < 0)
goto dma_chnl_free;
+ pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+ if (IS_ERR(pinctrl))
+ dev_warn(&pdev->dev,
+ "pins are not configured from the driver\n");
+
pm_runtime_use_autosuspend(&pdev->dev);
pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT);
pm_runtime_enable(&pdev->dev);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* [REPOST PATCH v2 1/2] spi: omap2-mcspi: add pinctrl support
2012-09-18 12:01 [REPOST PATCH v2 1/2] spi: omap2-mcspi: add pinctrl support Matt Porter
@ 2012-09-18 12:08 ` Shubhrajyoti
2012-09-18 16:55 ` Tony Lindgren
2012-09-22 16:06 ` Mark Brown
1 sibling, 1 reply; 4+ messages in thread
From: Shubhrajyoti @ 2012-09-18 12:08 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 18 September 2012 05:31 PM, Matt Porter wrote:
> Adds pinctrl support to support OMAP platforms that boot from DT
> and rely on pinctrl support to set pinmuxes.
looks good
Acked-by: Shubhrajyoti D <shubhrajyoti@ti.com>
> Signed-off-by: Matt Porter <mporter@ti.com>
> ---
> drivers/spi/spi-omap2-mcspi.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
> index b2fb141..9502566 100644
> --- a/drivers/spi/spi-omap2-mcspi.c
> +++ b/drivers/spi/spi-omap2-mcspi.c
> @@ -38,6 +38,8 @@
> #include <linux/pm_runtime.h>
> #include <linux/of.h>
> #include <linux/of_device.h>
> +#include <linux/pinctrl/consumer.h>
> +#include <linux/err.h>
>
> #include <linux/spi/spi.h>
>
> @@ -1124,6 +1126,7 @@ static int __devinit omap2_mcspi_probe(struct platform_device *pdev)
> static int bus_num = 1;
> struct device_node *node = pdev->dev.of_node;
> const struct of_device_id *match;
> + struct pinctrl *pinctrl;
>
> master = spi_alloc_master(&pdev->dev, sizeof *mcspi);
> if (master == NULL) {
> @@ -1219,6 +1222,11 @@ static int __devinit omap2_mcspi_probe(struct platform_device *pdev)
> if (status < 0)
> goto dma_chnl_free;
>
> + pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
> + if (IS_ERR(pinctrl))
> + dev_warn(&pdev->dev,
> + "pins are not configured from the driver\n");
> +
> pm_runtime_use_autosuspend(&pdev->dev);
> pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT);
> pm_runtime_enable(&pdev->dev);
^ permalink raw reply [flat|nested] 4+ messages in thread* [REPOST PATCH v2 1/2] spi: omap2-mcspi: add pinctrl support
2012-09-18 12:01 [REPOST PATCH v2 1/2] spi: omap2-mcspi: add pinctrl support Matt Porter
2012-09-18 12:08 ` Shubhrajyoti
@ 2012-09-22 16:06 ` Mark Brown
1 sibling, 0 replies; 4+ messages in thread
From: Mark Brown @ 2012-09-22 16:06 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Sep 18, 2012 at 08:01:25AM -0400, Matt Porter wrote:
> Adds pinctrl support to support OMAP platforms that boot from DT
> and rely on pinctrl support to set pinmuxes.
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-09-22 16:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-18 12:01 [REPOST PATCH v2 1/2] spi: omap2-mcspi: add pinctrl support Matt Porter
2012-09-18 12:08 ` Shubhrajyoti
2012-09-18 16:55 ` Tony Lindgren
2012-09-22 16:06 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).