From patchwork Thu Aug 24 09:21:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 805368 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xdJh96tWjz9sPk for ; Thu, 24 Aug 2017 19:21:29 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752111AbdHXJV0 (ORCPT ); Thu, 24 Aug 2017 05:21:26 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:60704 "EHLO andre.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751849AbdHXJVS (ORCPT ); Thu, 24 Aug 2017 05:21:18 -0400 Received: from ayla.of.borg ([84.195.106.246]) by andre.telenet-ops.be with bizsmtp id 0xMG1w00r5JzmfG01xMGiJ; Thu, 24 Aug 2017 11:21:17 +0200 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.86_2) (envelope-from ) id 1dkoKB-0002wn-Hj; Thu, 24 Aug 2017 11:21:15 +0200 Received: from geert by ramsan with local (Exim 4.86_2) (envelope-from ) id 1dkoKC-0001Ow-Hb; Thu, 24 Aug 2017 11:21:16 +0200 From: Geert Uytterhoeven To: Wolfram Sang , Rob Herring , Mark Rutland , Haavard Skinnemoen Cc: linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH/RFC 2/3] i2c: gpio: Add support for named gpios in DT Date: Thu, 24 Aug 2017 11:21:13 +0200 Message-Id: <1503566474-5335-3-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1503566474-5335-1-git-send-email-geert+renesas@glider.be> References: <1503566474-5335-1-git-send-email-geert+renesas@glider.be> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Add support for the new DT bindings using named gpios, which are less error-prone than unnamed gpios. The latter are still supported as a fallback. Signed-off-by: Geert Uytterhoeven --- drivers/i2c/busses/i2c-gpio.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c index 0ef8fcc6ac3aca1e..45b7ec99dc210bbe 100644 --- a/drivers/i2c/busses/i2c-gpio.c +++ b/drivers/i2c/busses/i2c-gpio.c @@ -88,6 +88,15 @@ static int i2c_gpio_getscl(void *data) static int of_i2c_gpio_get_pins(struct device_node *np, unsigned int *sda_pin, unsigned int *scl_pin) { + *sda_pin = of_get_named_gpio(np, "sda-gpios", 0); + *scl_pin = of_get_named_gpio(np, "scl-gpios", 0); + if (*sda_pin == -EPROBE_DEFER || *scl_pin == -EPROBE_DEFER) + return -EPROBE_DEFER; + + if (gpio_is_valid(*sda_pin) && gpio_is_valid(*scl_pin)) + return 0; + + /* Try deprecated unnamed gpios */ if (of_gpio_count(np) < 2) return -ENODEV;