From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50FC8C433FE for ; Mon, 3 Jan 2022 18:43:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233956AbiACSnP (ORCPT ); Mon, 3 Jan 2022 13:43:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232071AbiACSnP (ORCPT ); Mon, 3 Jan 2022 13:43:15 -0500 Received: from mail-ua1-x931.google.com (mail-ua1-x931.google.com [IPv6:2607:f8b0:4864:20::931]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DCB0DC061784 for ; Mon, 3 Jan 2022 10:43:14 -0800 (PST) Received: by mail-ua1-x931.google.com with SMTP id y4so2394280uad.1 for ; Mon, 03 Jan 2022 10:43:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=nJQBNk6axtfRB7RGJeAUInYTBuvs/80E/DpFdWXcxTw=; b=pueGbZ3h1ny2MEwEmNqEHMbRlcfwFBhSTwqfKj2WWvApEm70cprF6KcJ53sOijU058 IoukxZWHD0gHF4wofYp76S2O9pc2etOve+cWkVIlbZVKb0B46/deu5gdZkND9LlYFn1f da9jT5L4o/+uQT/JP9op+Ax37qefK0CNsWdsH1zG6FnVUR105MK8QvPlgGLvxVkGgjP6 h2joz/eltAq8qB5f/gaRLRix7OrdnlYgpoCWWHnQ9o8faMDwCQwA7no4/9P+Fe/vIWSZ G2uu0JCH3A4fh0JACBouWNBKODRc9XtiD5BP602i9W3l9ITWxqh7d7T1l0IW7amxW30N L3Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=nJQBNk6axtfRB7RGJeAUInYTBuvs/80E/DpFdWXcxTw=; b=13glmgR1eEypK2cX7vJ9GcmFyks9n1+pytXsE1HMdAxuhzuCdM+f1ikVZy3F5mPFhP zIJV5q74wWJyQqX8LR3JHAe5LdkdjReOX65tiPKvwZsztiW4OsQLlNIz2Hks2rfbbNBA 2Y9tzBmXCywJXIxqYTCpEv586gCg+IMs8F+FBaniwMnHFJgJWETPKCLYmL7LomZyl2i3 WPEiDfWpjww8jWxuOKM7AhrvMo/Z/fCtO4F9pby5UMcJ763ExQbJ6LG4tdicYkps2gTV vB0/c2wejAuPnrzxMJlLe5rcFLeBAkOipDoMadr8XItRsHhaPZXwKoZmYLFZ6DCe/o12 9lOg== X-Gm-Message-State: AOAM531OKKz3RHh8LlsGUp/yFu088QCi55gJ7CHndSZ989mQEtacDR37 jRQ7M2C/BWfrKONWpLhnWTuv0nL4cvvaPqALYCDBHA== X-Google-Smtp-Source: ABdhPJwX2k6vaWwYLozxhBfsZvEvo2FdmoJsPYoTEOsunSCI8p/WioPIFzSX+cajzPMg+b6x7iY6xl2+GwAUad8DJt0= X-Received: by 2002:a67:e10c:: with SMTP id d12mr13619941vsl.20.1641235393823; Mon, 03 Jan 2022 10:43:13 -0800 (PST) MIME-Version: 1.0 References: <20211231161930.256733-1-krzysztof.kozlowski@canonical.com> <20211231161930.256733-3-krzysztof.kozlowski@canonical.com> In-Reply-To: <20211231161930.256733-3-krzysztof.kozlowski@canonical.com> From: Sam Protsenko Date: Mon, 3 Jan 2022 20:43:02 +0200 Message-ID: Subject: Re: [PATCH 02/24] pinctrl: samsung: accept GPIO bank nodes with a suffix To: Krzysztof Kozlowski Cc: Tomasz Figa , Sylwester Nawrocki , Linus Walleij , Rob Herring , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Marek Szyprowski , Sylwester Nawrocki , Chanho Park Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org On Fri, 31 Dec 2021 at 18:20, Krzysztof Kozlowski wrote: > > Existing dt-bindings expected that each GPIO/pin bank within pin > controller has its own node with name matching the bank (e.g. gpa0, > gpx2) and "gpio-controller" property. The node name is then used for > matching between driver data and DTS. > > Newly introduced dtschema expects to have nodes ending with "-gpio-bank" > suffix, so rewrite bank-devicetree matching to look for old and new > style of naming. > > Signed-off-by: Krzysztof Kozlowski > --- > drivers/pinctrl/samsung/pinctrl-samsung.c | 57 ++++++++++++++++++----- > 1 file changed, 45 insertions(+), 12 deletions(-) > > diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c > index f2864a7869b3..561853df8ef7 100644 > --- a/drivers/pinctrl/samsung/pinctrl-samsung.c > +++ b/drivers/pinctrl/samsung/pinctrl-samsung.c > @@ -1011,13 +1011,56 @@ static void samsung_banks_of_node_put(struct samsung_pinctrl_drv_data *d) > of_node_put(bank->of_node); > } > > +/* > + * Iterate over all driver pin banks to find one matching the name of node, > + * skipping optional "-gpio" node suffix. When found, assign node to the bank. > + */ > +static void samsung_banks_of_node_get(struct device *dev, > + struct samsung_pinctrl_drv_data *d, > + struct device_node *node) > +{ > + const char *suffix = "-gpio-bank"; > + struct samsung_pin_bank *bank; > + struct device_node *child; > + /* Pin bank names are up to 4 characters */ > + char node_name[20]; > + unsigned int i; > + size_t len; > + > + bank = d->pin_banks; > + for (i = 0; i < d->nr_banks; ++i, ++bank) { > + strscpy(node_name, bank->name, sizeof(node_name)); > + len = strlcat(node_name, suffix, sizeof(node_name)); > + if (len == sizeof(sizeof(node_name))) { Double sizeof is probably wrong? > + dev_err(dev, "Too long pin bank name '%s', ignoring\n", > + bank->name); > + continue; > + } > + > + for_each_child_of_node(node, child) { > + if (!of_find_property(child, "gpio-controller", NULL)) > + continue; > + if (of_node_name_eq(child, node_name)) > + break; > + else if (of_node_name_eq(child, bank->name)) > + break; > + } > + > + if (child) > + bank->of_node = child; > + else > + dev_warn(dev, "Missing node for bank %s - invalid DTB\n", > + bank->name); > + /* child reference dropped in samsung_drop_banks_of_node() */ > + } > +} > + > /* retrieve the soc specific data */ > static const struct samsung_pin_ctrl * > samsung_pinctrl_get_soc_data(struct samsung_pinctrl_drv_data *d, > struct platform_device *pdev) > { > struct device_node *node = pdev->dev.of_node; > - struct device_node *np; > const struct samsung_pin_bank_data *bdata; > const struct samsung_pin_ctrl *ctrl; > struct samsung_pin_bank *bank; > @@ -1081,17 +1124,7 @@ samsung_pinctrl_get_soc_data(struct samsung_pinctrl_drv_data *d, > */ > d->virt_base = virt_base[0]; > > - for_each_child_of_node(node, np) { > - if (!of_find_property(np, "gpio-controller", NULL)) > - continue; > - bank = d->pin_banks; > - for (i = 0; i < d->nr_banks; ++i, ++bank) { > - if (of_node_name_eq(np, bank->name)) { > - bank->of_node = np; > - break; > - } > - } > - } > + samsung_banks_of_node_get(&pdev->dev, d, node); > > d->pin_base = pin_base; > pin_base += d->nr_pins; > -- > 2.32.0 > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D59D6C433EF for ; Mon, 3 Jan 2022 18:44:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=gwrE06My3R6QsOCVk8tLC+texxGH5MYCRKMrBzgOLC0=; b=mp7Lmbg9N+PwoG Ab2vbyM1KYBGmdfM5EfDTK2QKxyKbdPtHX4dW91kwjBmGEUo+4tQy+h08SGj/HszJnAiWwTnFI+Li CZdX9qp0yaRBFTEa3zmyjrRTFoKDUg9ulbc6kPnv/+xJD8mLK74WjpOxMdzU/5crIYR2I11jsfYwR HTNF/Br3z97DPWEXGe0fxjNs7yMhYSH5xhzf38QHUyEONehlGpt47DwlHElWkOyW8or9xZB+wRo7G Zq99KO3+JKkjWhybKt5IzzsxG0v8XHeU77EBdzNwemItc/pXXwuRjiG1+iRpgfqLCmyKpsvttyABf meZWi0kl1kGouftvG7aA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n4SIg-009r7B-I0; Mon, 03 Jan 2022 18:43:18 +0000 Received: from mail-ua1-x92d.google.com ([2607:f8b0:4864:20::92d]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n4SId-009r6d-Fa for linux-arm-kernel@lists.infradead.org; Mon, 03 Jan 2022 18:43:17 +0000 Received: by mail-ua1-x92d.google.com with SMTP id o63so59258834uao.5 for ; Mon, 03 Jan 2022 10:43:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=nJQBNk6axtfRB7RGJeAUInYTBuvs/80E/DpFdWXcxTw=; b=pueGbZ3h1ny2MEwEmNqEHMbRlcfwFBhSTwqfKj2WWvApEm70cprF6KcJ53sOijU058 IoukxZWHD0gHF4wofYp76S2O9pc2etOve+cWkVIlbZVKb0B46/deu5gdZkND9LlYFn1f da9jT5L4o/+uQT/JP9op+Ax37qefK0CNsWdsH1zG6FnVUR105MK8QvPlgGLvxVkGgjP6 h2joz/eltAq8qB5f/gaRLRix7OrdnlYgpoCWWHnQ9o8faMDwCQwA7no4/9P+Fe/vIWSZ G2uu0JCH3A4fh0JACBouWNBKODRc9XtiD5BP602i9W3l9ITWxqh7d7T1l0IW7amxW30N L3Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=nJQBNk6axtfRB7RGJeAUInYTBuvs/80E/DpFdWXcxTw=; b=ngE8QZFY++WcZrQI47OXLFyREHoHJ53dFyxpRHi/s3Zz1deMtcUNMMmdpN6rIq9uXv RA9moTqeWBm4V+GiLylBihFD1aw+XDaeW4MNf0PK88KnJ3m0mq+Oj+1wwj5lFhYxP4i/ OhLX5aqRLAuGjkq1jOu0W+K26GBngl0YwUa4CEtqcC0X80hCc+mrPMJ5ThpsHSzvWERm gpQTLOtn9Fy5k1vXUYDA7+oXZOjTHZDfLkfmmpCwxCrUBD/iNwwpjj3KeWd2Ulb5cph/ y7UbpKcLEYMMSb8VATRSbaJOXfJ4FhI6K7NVaD4nMiRlYN+60p+krwuZ/EVR5c4FMEgq pgag== X-Gm-Message-State: AOAM530zbyUNqmx2faw1pcLGhCXOwJm4zRwwq/ucrT828AGgesRNknvm CRtT76T/QntBrKE9E8H/xy7c8XqtdH6y8P6a5SVRB+ScdUU= X-Google-Smtp-Source: ABdhPJwX2k6vaWwYLozxhBfsZvEvo2FdmoJsPYoTEOsunSCI8p/WioPIFzSX+cajzPMg+b6x7iY6xl2+GwAUad8DJt0= X-Received: by 2002:a67:e10c:: with SMTP id d12mr13619941vsl.20.1641235393823; Mon, 03 Jan 2022 10:43:13 -0800 (PST) MIME-Version: 1.0 References: <20211231161930.256733-1-krzysztof.kozlowski@canonical.com> <20211231161930.256733-3-krzysztof.kozlowski@canonical.com> In-Reply-To: <20211231161930.256733-3-krzysztof.kozlowski@canonical.com> From: Sam Protsenko Date: Mon, 3 Jan 2022 20:43:02 +0200 Message-ID: Subject: Re: [PATCH 02/24] pinctrl: samsung: accept GPIO bank nodes with a suffix To: Krzysztof Kozlowski Cc: Tomasz Figa , Sylwester Nawrocki , Linus Walleij , Rob Herring , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Marek Szyprowski , Sylwester Nawrocki , Chanho Park X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220103_104315_612927_1E95BC4E X-CRM114-Status: GOOD ( 25.49 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, 31 Dec 2021 at 18:20, Krzysztof Kozlowski wrote: > > Existing dt-bindings expected that each GPIO/pin bank within pin > controller has its own node with name matching the bank (e.g. gpa0, > gpx2) and "gpio-controller" property. The node name is then used for > matching between driver data and DTS. > > Newly introduced dtschema expects to have nodes ending with "-gpio-bank" > suffix, so rewrite bank-devicetree matching to look for old and new > style of naming. > > Signed-off-by: Krzysztof Kozlowski > --- > drivers/pinctrl/samsung/pinctrl-samsung.c | 57 ++++++++++++++++++----- > 1 file changed, 45 insertions(+), 12 deletions(-) > > diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c > index f2864a7869b3..561853df8ef7 100644 > --- a/drivers/pinctrl/samsung/pinctrl-samsung.c > +++ b/drivers/pinctrl/samsung/pinctrl-samsung.c > @@ -1011,13 +1011,56 @@ static void samsung_banks_of_node_put(struct samsung_pinctrl_drv_data *d) > of_node_put(bank->of_node); > } > > +/* > + * Iterate over all driver pin banks to find one matching the name of node, > + * skipping optional "-gpio" node suffix. When found, assign node to the bank. > + */ > +static void samsung_banks_of_node_get(struct device *dev, > + struct samsung_pinctrl_drv_data *d, > + struct device_node *node) > +{ > + const char *suffix = "-gpio-bank"; > + struct samsung_pin_bank *bank; > + struct device_node *child; > + /* Pin bank names are up to 4 characters */ > + char node_name[20]; > + unsigned int i; > + size_t len; > + > + bank = d->pin_banks; > + for (i = 0; i < d->nr_banks; ++i, ++bank) { > + strscpy(node_name, bank->name, sizeof(node_name)); > + len = strlcat(node_name, suffix, sizeof(node_name)); > + if (len == sizeof(sizeof(node_name))) { Double sizeof is probably wrong? > + dev_err(dev, "Too long pin bank name '%s', ignoring\n", > + bank->name); > + continue; > + } > + > + for_each_child_of_node(node, child) { > + if (!of_find_property(child, "gpio-controller", NULL)) > + continue; > + if (of_node_name_eq(child, node_name)) > + break; > + else if (of_node_name_eq(child, bank->name)) > + break; > + } > + > + if (child) > + bank->of_node = child; > + else > + dev_warn(dev, "Missing node for bank %s - invalid DTB\n", > + bank->name); > + /* child reference dropped in samsung_drop_banks_of_node() */ > + } > +} > + > /* retrieve the soc specific data */ > static const struct samsung_pin_ctrl * > samsung_pinctrl_get_soc_data(struct samsung_pinctrl_drv_data *d, > struct platform_device *pdev) > { > struct device_node *node = pdev->dev.of_node; > - struct device_node *np; > const struct samsung_pin_bank_data *bdata; > const struct samsung_pin_ctrl *ctrl; > struct samsung_pin_bank *bank; > @@ -1081,17 +1124,7 @@ samsung_pinctrl_get_soc_data(struct samsung_pinctrl_drv_data *d, > */ > d->virt_base = virt_base[0]; > > - for_each_child_of_node(node, np) { > - if (!of_find_property(np, "gpio-controller", NULL)) > - continue; > - bank = d->pin_banks; > - for (i = 0; i < d->nr_banks; ++i, ++bank) { > - if (of_node_name_eq(np, bank->name)) { > - bank->of_node = np; > - break; > - } > - } > - } > + samsung_banks_of_node_get(&pdev->dev, d, node); > > d->pin_base = pin_base; > pin_base += d->nr_pins; > -- > 2.32.0 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel