From patchwork Mon Oct 22 16:08:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 1626901 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 30503DFB79 for ; Mon, 22 Oct 2012 16:15:30 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TQKcZ-00069x-Gb; Mon, 22 Oct 2012 16:12:56 +0000 Received: from mail-da0-f49.google.com ([209.85.210.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TQKbg-0005eD-FH for linux-arm-kernel@lists.infradead.org; Mon, 22 Oct 2012 16:12:02 +0000 Received: by mail-da0-f49.google.com with SMTP id q27so1356942daj.36 for ; Mon, 22 Oct 2012 09:11:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=WGQsPrapCATr0WHWD+vg+T/1lanRaXAhhMXx+Itvq/Y=; b=xSJCABe/tB65oFYXlECjCy/eF+942lvDi8iMrGTniQE3kllzeS3hpQEcJ+cYiFobkA e1by/Hc+reI0NBgYSh+993LUhmbBNsc94Pq1LP4FSasciVj2RcE4p7Ar11P6Q7pz2/sN sHgWhpCnkBUCqOI/vlJY1IUrzExqbrOG3bANp6Nb7i3e1Q3OjgMyMr1B6x2RwwMUEfnc 0EvGX3/px0uQrbmXt3/OeS4NC/eI5nYwg4qXj+qz+a4NTBVJ7+FAI8mMPuMeDm6YaCNU duRdgzo3DQlRB8ycmRiFUsrwNEMhnnk5OggQDSi3zVx+l2+HoRTJAoNZMUHjqYInjV2A MsBg== Received: by 10.66.89.138 with SMTP id bo10mr27409301pab.0.1350922318161; Mon, 22 Oct 2012 09:11:58 -0700 (PDT) Received: from localhost ([58.39.221.134]) by mx.google.com with ESMTPS id ko10sm5322642pbc.1.2012.10.22.09.11.51 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 22 Oct 2012 09:11:57 -0700 (PDT) From: Haojian Zhuang To: swarren@wwwdotorg.org, linux-arm-kernel@lists.infradead.org, arnd@arndb.de, tony@atomide.com, devicetree-discuss@lists.ozlabs.org, linus.walleij@linaro.org Subject: [PATCH v2 8/9] i2c: pxa: configure pinmux Date: Tue, 23 Oct 2012 00:08:58 +0800 Message-Id: <1350922139-3693-9-git-send-email-haojian.zhuang@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1350922139-3693-1-git-send-email-haojian.zhuang@gmail.com> References: <1350922139-3693-1-git-send-email-haojian.zhuang@gmail.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.210.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (haojian.zhuang[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Haojian Zhuang X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Configure pins by pinctrl driver. Signed-off-by: Haojian Zhuang Acked-by: Linus Walleij --- drivers/i2c/busses/i2c-pxa.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 7c8b5d0..11e4a30 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -1051,6 +1052,7 @@ static int i2c_pxa_probe_dt(struct platform_device *pdev, struct pxa_i2c *i2c, enum pxa_i2c_types *i2c_types) { struct device_node *np = pdev->dev.of_node; + struct pinctrl *pinctrl; const struct of_device_id *of_id = of_match_device(i2c_pxa_dt_ids, &pdev->dev); int ret; @@ -1063,6 +1065,9 @@ static int i2c_pxa_probe_dt(struct platform_device *pdev, struct pxa_i2c *i2c, return ret; } pdev->id = ret; + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); + if (IS_ERR(pinctrl)) + return -EPROBE_DEFER; if (of_get_property(np, "mrvl,i2c-polling", NULL)) i2c->use_pio = 1; if (of_get_property(np, "mrvl,i2c-fast-mode", NULL))