From patchwork Mon Oct 24 07:43:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 78866 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp2435449qge; Mon, 24 Oct 2016 00:42:24 -0700 (PDT) X-Received: by 10.98.81.129 with SMTP id f123mr17993091pfb.36.1477294944374; Mon, 24 Oct 2016 00:42:24 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i4si11788090paf.128.2016.10.24.00.42.24; Mon, 24 Oct 2016 00:42:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934345AbcJXHmU (ORCPT + 27 others); Mon, 24 Oct 2016 03:42:20 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:39236 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932233AbcJXHmT (ORCPT ); Mon, 24 Oct 2016 03:42:19 -0400 Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id u9O7fdYa003112; Mon, 24 Oct 2016 16:41:40 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com u9O7fdYa003112 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1477294900; bh=blgsfm6lL1niVAxXaKkStFeiXHk2AOsCLvI1k8Cems0=; h=From:To:Cc:Subject:Date:From; b=GQsh+RuhdhwL9jKJbBM6BHm3kvhu3P074MCe5U+6pYUuoyP08gPPDtgnj7ixM+QnC r6LCMz8nJDlysZKZJM/Q+0d93227hURT7X4tmuaqNgvWxE/aCZj43o6u4Oc2j5m4+p mLAzyeTlgVhvKqpFOx92STDnFm7Nak3PRPdpDWcSP31tCGPwiuDXKHKN/0UP+lGYSP 3baow04Qd0+yCDS3B4Xm3uCeDqidAG7co7QEElbCVivFTdFVt0p+8rRbW5UQ/LMmMh A417jgi+4dLdZYam+JbjqT/P8rX0M4fe6Q30H3j6dxQx4aayp95K/HZAN5nmxbAH5R a09k9aLpdCnVQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-gpio@vger.kernel.org Cc: Linus Walleij , Vladimir Zapolskiy , Alexandre Courbot , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [RFC PATCH] gpio: of: fix GPIO drivers with multiple gpio_chip for a single node Date: Mon, 24 Oct 2016 16:43:53 +0900 Message-Id: <1477295033-6008-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Sylvain Lemieux reports the LPC32xx GPIO driver is broken since commit 762c2e46c059 ("gpio: of: remove of_gpiochip_and_xlate() and struct gg_data"). Probably, gpio-etraxfs.c and gpio-davinci.c are broken as well. Those drivers register multiple gpio_chip that are associated to a single OF node, and their own .of_xlate() checks if the passed gpio_chip is valid. Now, the problem is of_find_gpiochip_by_node() returns the first gpio_chip found to match the given node. So, .of_xlate() fails, except for the first GPIO bank. Reverting the commit could be a solution, but I do not want to go back to the mess of struct gg_data. Another solution here is to take the match by a node pointer and the success of .of_xlate(). It is a bit clumsy to call .of_xlate twice; for gpio_chip matching and for really getting the gpio_desc index. Perhaps, the long-term goal might be to convert drivers to single chip registration, but this commit will solve the problem until then. Signed-off-by: Masahiro Yamada Reported-by: --- drivers/gpio/gpiolib-of.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) -- 1.9.1 diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index ecad3f0..f996596 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -26,14 +26,18 @@ #include "gpiolib.h" -static int of_gpiochip_match_node(struct gpio_chip *chip, void *data) +static int of_gpiochip_match_node_and_xlate(struct gpio_chip *chip, void *data) { - return chip->gpiodev->dev.of_node == data; + struct of_phandle_args *gpiospec = data; + + return chip->gpiodev->dev.of_node == gpiospec->np && + !chip->of_xlate(chip, gpiospec, NULL); } -static struct gpio_chip *of_find_gpiochip_by_node(struct device_node *np) +static struct gpio_chip *of_find_gpiochip_by_xlate( + struct of_phandle_args *gpiospec) { - return gpiochip_find(np, of_gpiochip_match_node); + return gpiochip_find(gpiospec, of_gpiochip_match_node_and_xlate); } static struct gpio_desc *of_xlate_and_get_gpiod_flags(struct gpio_chip *chip, @@ -79,7 +83,7 @@ struct gpio_desc *of_get_named_gpiod_flags(struct device_node *np, return ERR_PTR(ret); } - chip = of_find_gpiochip_by_node(gpiospec.np); + chip = of_find_gpiochip_by_xlate(&gpiospec); if (!chip) { desc = ERR_PTR(-EPROBE_DEFER); goto out;