From patchwork Fri Dec 21 09:45:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 1902741 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id A842A40076 for ; Fri, 21 Dec 2012 09:50:39 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TlzCY-0006SE-G1; Fri, 21 Dec 2012 09:47:35 +0000 Received: from mail-pb0-f46.google.com ([209.85.160.46]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TlzB2-0005jT-Ac for linux-arm-kernel@lists.infradead.org; Fri, 21 Dec 2012 09:46:01 +0000 Received: by mail-pb0-f46.google.com with SMTP id wy7so2614500pbc.33 for ; Fri, 21 Dec 2012 01:45:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=zjtL/Hm6qAnsO1Mjh9urlqJ10MGzzUsDhYrZoMdWyGI=; b=LAV3yE72S3lNVq19RBZ6yq+VhfK7pdcvYq0/FH4pFO11jr/YR56JY+jeaSMwBOSjNT pussiwVsmUPe1eKiql8QnzgstLN+xg2I1uiPffceq6RVDaljbafUmiXVxQ1ZrNMbJ9Gl eO1zNJoLjZU1Bz3i47mc8gPGwBiynBtSjgCncKd68466E9wC2W8hau4yibuHYrINIhPd cWkfwHBBTlOtlzqWL/HyebLI9j93z9Ei1IijjufWB4aUDiVliemqOPri/CZcIc44V2t7 un8BBno06bpO0JQL1nVR3VeBigWke8P5qOf9lwrgaFVCD6CtjFZ4f5iHoccsM2wD4Ebv k5rQ== X-Received: by 10.69.0.199 with SMTP id ba7mr22049012pbd.165.1356083157992; Fri, 21 Dec 2012 01:45:57 -0800 (PST) Received: from localhost.localdomain ([116.224.148.148]) by mx.google.com with ESMTPS id t5sm7104258paw.20.2012.12.21.01.45.54 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Dec 2012 01:45:57 -0800 (PST) From: Haojian Zhuang To: linus.walleij@linaro.org, tony@atomide.com, linux-arm-kernel@lists.infradead.org, swarren@nvidia.com Subject: [PATCH v6 8/8] i2c: pxa: configure pinmux Date: Fri, 21 Dec 2012 17:45:18 +0800 Message-Id: <1356083118-18857-9-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1356083118-18857-1-git-send-email-haojian.zhuang@linaro.org> References: <1356083118-18857-1-git-send-email-haojian.zhuang@linaro.org> X-Gm-Message-State: ALoCoQlb2UJW9l7LTpSL2bAF6JT0jp7X4Av4aNZnvBkuWB5rfyRFp4Z4dwrfi4ViRrOjgtubPNYj X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121221_044600_592866_AA40BB25 X-CRM114-Status: GOOD ( 12.11 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.46 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 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 From: Haojian Zhuang 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))