From mboxrd@z Thu Jan 1 00:00:00 1970 From: shubhrajyoti@ti.com (Shubhrajyoti) Date: Tue, 18 Sep 2012 10:57:26 +0530 Subject: [PATCH v2 1/2] spi: omap2-mcspi: add pinctrl support In-Reply-To: <1347902538-21208-2-git-send-email-mporter@ti.com> References: <1347902538-21208-1-git-send-email-mporter@ti.com> <1347902538-21208-2-git-send-email-mporter@ti.com> Message-ID: <5058063E.40509@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Monday 17 September 2012 10:52 PM, Matt Porter wrote: > Adds pinctrl support to support OMAP platforms that boot from DT > and rely on pinctrl support to set pinmuxes. > > Signed-off-by: Matt Porter > --- looks good to me. you may want to repost with Mark in cc to review. Acked-by: Shubhrajyoti D > 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 > #include > #include > +#include > +#include > > #include > > @@ -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);