From patchwork Wed Nov 7 15:19:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 1711251 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 5B4F1DFB7A for ; Wed, 7 Nov 2012 15:25:15 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TW7Sg-0002Z9-Rx; Wed, 07 Nov 2012 15:22:40 +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 1TW7QY-0001NE-It for linux-arm-kernel@lists.infradead.org; Wed, 07 Nov 2012 15:20:28 +0000 Received: by mail-da0-f49.google.com with SMTP id q27so683972daj.36 for ; Wed, 07 Nov 2012 07:20:26 -0800 (PST) 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=naMstakljLej7MtJUtpPJJ1Ig6z7GGbi47xojcDyWFI=; b=T1FGs9L/DvuoUvHrgm7uYkd67Hy42+6lhNMp0qWdhSMM1CNOuoDwG1gszMiZgopqCq p/AUrAwz15n64BpI9yg9JTHtlSsWWtriUrPXm+32B3lFI92OlokcadLVIi7YdpYVfkfp XbKQuT0OtmGl0gtXrRAe9OMiGoC91o2TGOLlhoc9AYlmwh5LIb+vWs586lFLLZYsok+R uxkSjJ2e+5NfuZs4XZBzRlf0T32HWSblhQeeEEacgoHupLIkXxg0g2Cypg1KSvM2FUEf NERU6mpPjFY27kGkKcixCV8d5DG3g74dVws9A1zcvoYEyjHoB9HwN7WvOPuIvrTqELkX 0zUg== Received: by 10.66.73.102 with SMTP id k6mr12884230pav.22.1352301626272; Wed, 07 Nov 2012 07:20:26 -0800 (PST) Received: from localhost.localdomain ([174.139.116.75]) by mx.google.com with ESMTPS id uh10sm9534245pbc.35.2012.11.07.07.20.22 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Nov 2012 07:20:25 -0800 (PST) From: Haojian Zhuang To: linus.walleij@linaro.org, tony@atomide.com, swarren@wwwdotorg.org, linux-arm-kernel@lists.infradead.org, arnd@arndb.de Subject: [PATCH v4 8/9] i2c: pxa: configure pinmux Date: Wed, 7 Nov 2012 23:19:41 +0800 Message-Id: <1352301582-12244-9-git-send-email-haojian.zhuang@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1352301582-12244-1-git-send-email-haojian.zhuang@gmail.com> References: <1352301582-12244-1-git-send-email-haojian.zhuang@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121107_102026_991954_42C45328 X-CRM114-Status: GOOD ( 13.15 ) 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: Ben Dooks , 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 Cc: Ben Dooks Acked-by: Linus Walleij --- drivers/i2c/busses/i2c-pxa.c | 5 +++++ 1 file changed, 5 insertions(+) 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))