From patchwork Tue Sep 18 12:01:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Porter X-Patchwork-Id: 1472291 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id D20D5DF24C for ; Tue, 18 Sep 2012 12:00:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755403Ab2IRL74 (ORCPT ); Tue, 18 Sep 2012 07:59:56 -0400 Received: from mail-ie0-f174.google.com ([209.85.223.174]:41889 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755018Ab2IRL7z (ORCPT ); Tue, 18 Sep 2012 07:59:55 -0400 Received: by ieak13 with SMTP id k13so2106302iea.19 for ; Tue, 18 Sep 2012 04:59:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=HUk+qi9zB/Mw4bAle9SUbzvVKCuYUsrytsY66z56H1c=; b=ILRh+hbvNo+Df6bhkj2rsuF5DChZSizPrLgKzKBba79vx528Tm+nDZdEsCTIkdDqTs lQiVNOMfvcynYM5pSAxDyqt97Oh7GJRSZsBYI4uDRBqmN3Mihjr1YaRTOotWpr51zOL2 XJwsVtHY9vDs7ch5m5dWuHwa5cKWa5Cx8PTAebl6zj1LZsqU8vs9t6BA7+nHiuHqc96O kYJJDJSyHPhF7iSnuBFxNShGWEDFQBDOytBP0t7xdqLVBtMPMQjznE2jQcetzvgFCb9A XeJ915vWluBubpeveQOgwSNSsLLkqulSDyKID4r24xF4rUgo2IOEgFewh5NQ7H9ucYer nkSw== Received: by 10.50.196.231 with SMTP id ip7mr10265173igc.7.1347969595137; Tue, 18 Sep 2012 04:59:55 -0700 (PDT) Received: from beef.ohporter.com (cpe-24-166-64-7.neo.res.rr.com. [24.166.64.7]) by mx.google.com with ESMTPS id uq6sm10392836igb.14.2012.09.18.04.59.52 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 18 Sep 2012 04:59:53 -0700 (PDT) From: Matt Porter To: Linux OMAP List , Linux SPI Devel List , Grant Likely , Tony Lindgren Cc: Linux Kernel Mailing List , Linux ARM Kernel List , AnilKumar , Mark Brown Subject: [REPOST PATCH v2 1/2] spi: omap2-mcspi: add pinctrl support Date: Tue, 18 Sep 2012 08:01:25 -0400 Message-Id: <1347969685-15571-1-git-send-email-mporter@ti.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Adds pinctrl support to support OMAP platforms that boot from DT and rely on pinctrl support to set pinmuxes. Signed-off-by: Matt Porter Acked-by: Shubhrajyoti D Acked-by: Tony Lindgren --- 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);