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 X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3302ACA9EB6 for ; Wed, 23 Oct 2019 09:01:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EE55C20679 for ; Wed, 23 Oct 2019 09:01:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="uSGIcfd7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390436AbfJWJBd (ORCPT ); Wed, 23 Oct 2019 05:01:33 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:55571 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732361AbfJWJBd (ORCPT ); Wed, 23 Oct 2019 05:01:33 -0400 Received: by mail-wm1-f66.google.com with SMTP id g24so11124862wmh.5 for ; Wed, 23 Oct 2019 02:01:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version; bh=aR0VSMnP4KkB+mkerf85b81/hB0bJCp5/Vkdc4wc6hA=; b=uSGIcfd72Gshs/oBfZ73FZmP5Z3y0RcKof9RadYgq/hhgMK47xtr7i8SxIZBsLfb/n mp4YdG1UypVdLUHfEmn41sQN3W9BkxDBLPGfII2edwAjhTCFG/HEfUkwMERiXayvpQ4o zwbahWSgVszS4hzwda+y5F0MlcuRfUcQrRHRsIOnsFe41ZR9Pc6ptIjfQG8Yt1hp0hOf bJJgAJ5BqiYXNQbbPCQ4MYz2o76PN91r6UgUBywdmBv0UFQNRJL7zT76lkh5uq2jpOUi j2spGC3yrUV8zaYWmmDQoalQtOoto70fVYiPSzN//fsavpigJ2TXhrW1P76hPwvVgcxY f1tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version; bh=aR0VSMnP4KkB+mkerf85b81/hB0bJCp5/Vkdc4wc6hA=; b=CdnWNs5JIpw7zeQV9CJVJJGdQEsxfKIkCAEpS3n9OZPa895NEnG+ohL6Hq+ZNWDBF4 jo4TKkakRfKSVvAOWQWJyLlngXXI8+K4OOdRmCBcGvUWkA5/j4vOwRlPg9pU0SS/zM+v NALzDGLB17puzDhMO0D/vsx3Cgyu7EpkzXqvO3Gfsoh2u0G31WHAg12jTbSSkjlx7tR7 n1u0gx/DQ1QmvSAAOPDYdNJCMkln3kcSfzLP1NOu3SsBe0Qb8S+6yoN3+MJS6ZhnYzQ/ 61xsmbxUGzI9ynlOyhtf6ddvAZLOJ8czvdjegnOtjc+an8bMQsL5+oJMv+dGxmLe+EfF cG5Q== X-Gm-Message-State: APjAAAV7F+gBd42GGT0LewdE34KWC++xxjKsKSyunGtLUV8gx90e6SJu zczjuLnAh1eqgTYnIHgMfC2MCg== X-Google-Smtp-Source: APXvYqyvQ8r2oQMybF8/Pj+naPcy6tRL9yoDeCNtwtwGQx9KxbqXPr4d7jlhu11P/1qFpoeyvtA1VQ== X-Received: by 2002:a1c:7911:: with SMTP id l17mr6675287wme.21.1571821290130; Wed, 23 Oct 2019 02:01:30 -0700 (PDT) Received: from localhost (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id q25sm5833925wra.3.2019.10.23.02.01.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2019 02:01:29 -0700 (PDT) References: <1571050492-6598-1-git-send-email-qianggui.song@amlogic.com> <1571050492-6598-3-git-send-email-qianggui.song@amlogic.com> User-agent: mu4e 1.3.3; emacs 26.2 From: Jerome Brunet To: Qianggui Song , Linus Walleij , linux-gpio@vger.kernel.org Cc: Neil Armstrong , Kevin Hilman , Martin Blumenstingl , Carlo Caione , "Rob Herring" , Xingyu Chen , "Jianxin Pan" , Hanjie Lin , "Mark Rutland" , linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 2/4] pinctrl: meson: add a new dt parse callback for Meson-A series SoCs In-reply-to: <1571050492-6598-3-git-send-email-qianggui.song@amlogic.com> Date: Wed, 23 Oct 2019 11:01:28 +0200 Message-ID: <1j4kzzvnrr.fsf@starbuckisacylon.baylibre.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org On Mon 14 Oct 2019 at 12:54, Qianggui Song wrote: > Meson A1 Soc share the same register layout of pinmux with previous > Meson-G12A, however there is difference for gpio and pin config register > in A1. The main difference is that registers before A1 are grouped by > function while those of A1 are by bank. The new register layout is as > below: > > /* first bank */ /* addr */ > - P_PADCTRL_GPIOP_I base + 0x00 << 2 > - P_PADCTRL_GPIOP_O base + 0x01 << 2 > - P_PADCTRL_GPIOP_OEN base + 0x02 << 2 > - P_PADCTRL_GPIOP_PULL_EN base + 0x03 << 2 > - P_PADCTRL_GPIOP_PULL_UP base + 0x04 << 2 > - P_PADCTRL_GPIOP_DS base + 0x05 << 2 > > /* second bank */ > - P_PADCTRL_GPIOB_I base + 0x10 << 2 > - P_PADCTRL_GPIOB_O base + 0x11 << 2 > - P_PADCTRL_GPIOB_OEN base + 0x12 << 2 > - P_PADCTRL_GPIOB_PULL_EN base + 0x13 << 2 > - P_PADCTRL_GPIOB_PULL_UP base + 0x14 << 2 > - P_PADCTRL_GPIOB_DS base + 0x15 << 2 > > Each bank contains at least 6 registers to be configured, if one bank > has more than 16 gpios, an extra P_PADCTRL_GPIO[X]_DS_EXT is included. > Between two adjacent P_PADCTRL_GPIO[X]_I, there is an offset 0x10, that > is to say, for third bank, the offsets will be 0x20,0x21,0x22,0x23,0x24 > ,0x25 according to above register layout. For previous chips, registers > are grouped according to their functions while registers of A1 are > according to bank. > > Current Meson pinctrl driver can cover such change by using base address > of GPIO as that of drive-strength.While simply giving reg_ds = reg_pullen > make wrong value to reg_ds for Socs that do not support drive-strength > like AXG.To make things simple, add an extra dt parser function for > a1 or later chip and remain the old dt parser function for old Socs. > > Signed-off-by: Qianggui Song > --- > drivers/pinctrl/meson/pinctrl-meson.c | 16 +++++++++++++++- > drivers/pinctrl/meson/pinctrl-meson.h | 7 +++++++ > 2 files changed, 22 insertions(+), 1 deletion(-) > > diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c > index 8bba9d053d9f..e8f6298fc96a 100644 > --- a/drivers/pinctrl/meson/pinctrl-meson.c > +++ b/drivers/pinctrl/meson/pinctrl-meson.c > @@ -695,6 +695,17 @@ static int meson_pinctrl_parse_dt(struct meson_pinctrl *pc, > return 0; > } > > +int meson_pinctrl_parse_dt_extra(struct meson_pinctrl *pc, > + struct device_node *node) This function is the fixup for the a1 family, AFAICT. It should be named as such and it belong in pinctrl-meson-a1.c Every controller performing fixups should have their function as well: (1) AO of gxbb, gxl and axg (2) AO of g12 and sm > +{ > + int ret; > + > + ret = meson_pinctrl_parse_dt(pc, node); As said in previous review, meson_pinctrl_parse_dt() should be called for every SoC to parse the *available* regions. The fixup, if necessary, will be done by providing a callback IOW, please: * rework meson_pinctrl_parse_dt() to only parse the avaialble region * don't call meson_pinctrl_parse_dt() from the extra function * provided the extra function for the AO controllers of the other SoCs > + pc->reg_ds = pc->reg_pullen; > + > + return ret; > +} > + > int meson_pinctrl_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > @@ -708,7 +719,10 @@ int meson_pinctrl_probe(struct platform_device *pdev) > pc->dev = dev; > pc->data = (struct meson_pinctrl_data *) of_device_get_match_data(dev); > > - ret = meson_pinctrl_parse_dt(pc, dev->of_node); > + if (pc->data->parse_dt) > + ret = pc->data->parse_dt(pc, dev->of_node); > + else > + ret = meson_pinctrl_parse_dt(pc, dev->of_node); > if (ret) > return ret; > > diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h > index c696f3241a36..0cd6a869cae3 100644 > --- a/drivers/pinctrl/meson/pinctrl-meson.h > +++ b/drivers/pinctrl/meson/pinctrl-meson.h > @@ -11,6 +11,8 @@ > #include > #include > > +struct meson_pinctrl; > + > /** > * struct meson_pmx_group - a pinmux group > * > @@ -114,6 +116,7 @@ struct meson_pinctrl_data { > unsigned int num_banks; > const struct pinmux_ops *pmx_ops; > void *pmx_data; > + int (*parse_dt)(struct meson_pinctrl *pc, struct device_node *node); > }; > > struct meson_pinctrl { > @@ -171,3 +174,7 @@ int meson_pmx_get_groups(struct pinctrl_dev *pcdev, > > /* Common probe function */ > int meson_pinctrl_probe(struct platform_device *pdev); > + > +/* Extra dt parse function for register layout grouped by bank */ > +int meson_pinctrl_parse_dt_extra(struct meson_pinctrl *pc, > + struct device_node *node); 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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22E02CA9EB7 for ; Wed, 23 Oct 2019 09:01:36 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id EC39E21920 for ; Wed, 23 Oct 2019 09:01:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="E2NBzXbV"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="uSGIcfd7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EC39E21920 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date: In-reply-to:Subject:To:From:References:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=h/QwLTpO8CWWn0F0Nx3/9wYpwCpzWkz1Heha5C4nfUI=; b=E2NBzXbVY0+hDOF/Hx5Kaq1Th/ wSqCWikPHTiBjC2xbUlDbiYegTFJJYrGqpvvNV4rf+yaqsn8mO58livRu0IP0uf6vD9914keUQ1Fb +XiJHWjtXi0T+IrhvSLiXzDMsxGo0goaFiSvm3B2pbR+SozkUvkA5iY3d217Ugr8MYXomV8deRhIc IT6Ye4a5XmWSm4C+OF2Wx5LnBErdp4YOATzVdkobfR41m3cfS702EG/dFxOpEQNspD93SPrZ31J5N 5Z387lhKuwv8I1cRcI7dVvinqyCVDatYP2CNpRAccb9lWXO2eGPo4zEdfLgfuek+UpnM5Khoe6inb N2rrM5mw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iNCWN-0005Ee-KE; Wed, 23 Oct 2019 09:01:35 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iNCWK-0005Dn-7i for linux-arm-kernel@lists.infradead.org; Wed, 23 Oct 2019 09:01:34 +0000 Received: by mail-wm1-x341.google.com with SMTP id r19so20317191wmh.2 for ; Wed, 23 Oct 2019 02:01:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version; bh=aR0VSMnP4KkB+mkerf85b81/hB0bJCp5/Vkdc4wc6hA=; b=uSGIcfd72Gshs/oBfZ73FZmP5Z3y0RcKof9RadYgq/hhgMK47xtr7i8SxIZBsLfb/n mp4YdG1UypVdLUHfEmn41sQN3W9BkxDBLPGfII2edwAjhTCFG/HEfUkwMERiXayvpQ4o zwbahWSgVszS4hzwda+y5F0MlcuRfUcQrRHRsIOnsFe41ZR9Pc6ptIjfQG8Yt1hp0hOf bJJgAJ5BqiYXNQbbPCQ4MYz2o76PN91r6UgUBywdmBv0UFQNRJL7zT76lkh5uq2jpOUi j2spGC3yrUV8zaYWmmDQoalQtOoto70fVYiPSzN//fsavpigJ2TXhrW1P76hPwvVgcxY f1tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version; bh=aR0VSMnP4KkB+mkerf85b81/hB0bJCp5/Vkdc4wc6hA=; b=gKAIaLQ6Wd2LfrNH12SnbXi4oYjIal0J7jja0ux4ZhcepYIULPIXePW6XQmU66iHTr RjiCQOugTeAEXlpdPH1rDaH6MibCfWVhVsEmDA/kW9jmWTtW3ZO7tN/E2ZiW389DCrFY 88E7xT6kaXcfIFVkSVIemMX53V4MjJon+S/mAT5DLjmI+OD5HLekgVEU8Wp04QKtA34I IN4fvPZYYGRl/d7axO3O7rhvIi9DVedGNjTThJ3NcXhcqK6CZqCIWWKeLMqQldWm1y/p nwV68/q2UeHCjWolM9pjfCUQYpInZGhQgrV696Ee9OXgntYDAl6gpDlmo49boG9iJlUr ka+w== X-Gm-Message-State: APjAAAXnUKtcATFVM/OJMWBqhw2DWv3vNym+BqZvPbAEeOqXUuHleKdW ZmtUED9SgSK9aTUbizPHPPVsXA== X-Google-Smtp-Source: APXvYqyvQ8r2oQMybF8/Pj+naPcy6tRL9yoDeCNtwtwGQx9KxbqXPr4d7jlhu11P/1qFpoeyvtA1VQ== X-Received: by 2002:a1c:7911:: with SMTP id l17mr6675287wme.21.1571821290130; Wed, 23 Oct 2019 02:01:30 -0700 (PDT) Received: from localhost (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id q25sm5833925wra.3.2019.10.23.02.01.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2019 02:01:29 -0700 (PDT) References: <1571050492-6598-1-git-send-email-qianggui.song@amlogic.com> <1571050492-6598-3-git-send-email-qianggui.song@amlogic.com> User-agent: mu4e 1.3.3; emacs 26.2 From: Jerome Brunet To: Qianggui Song , Linus Walleij , linux-gpio@vger.kernel.org Subject: Re: [PATCH v3 2/4] pinctrl: meson: add a new dt parse callback for Meson-A series SoCs In-reply-to: <1571050492-6598-3-git-send-email-qianggui.song@amlogic.com> Date: Wed, 23 Oct 2019 11:01:28 +0200 Message-ID: <1j4kzzvnrr.fsf@starbuckisacylon.baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191023_020132_276379_4C42A053 X-CRM114-Status: GOOD ( 20.42 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Hanjie Lin , Jianxin Pan , Neil Armstrong , Martin Blumenstingl , Kevin Hilman , linux-kernel@vger.kernel.org, Rob Herring , linux-arm-kernel@lists.infradead.org, Carlo Caione , linux-amlogic@lists.infradead.org, Xingyu Chen Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon 14 Oct 2019 at 12:54, Qianggui Song wrote: > Meson A1 Soc share the same register layout of pinmux with previous > Meson-G12A, however there is difference for gpio and pin config register > in A1. The main difference is that registers before A1 are grouped by > function while those of A1 are by bank. The new register layout is as > below: > > /* first bank */ /* addr */ > - P_PADCTRL_GPIOP_I base + 0x00 << 2 > - P_PADCTRL_GPIOP_O base + 0x01 << 2 > - P_PADCTRL_GPIOP_OEN base + 0x02 << 2 > - P_PADCTRL_GPIOP_PULL_EN base + 0x03 << 2 > - P_PADCTRL_GPIOP_PULL_UP base + 0x04 << 2 > - P_PADCTRL_GPIOP_DS base + 0x05 << 2 > > /* second bank */ > - P_PADCTRL_GPIOB_I base + 0x10 << 2 > - P_PADCTRL_GPIOB_O base + 0x11 << 2 > - P_PADCTRL_GPIOB_OEN base + 0x12 << 2 > - P_PADCTRL_GPIOB_PULL_EN base + 0x13 << 2 > - P_PADCTRL_GPIOB_PULL_UP base + 0x14 << 2 > - P_PADCTRL_GPIOB_DS base + 0x15 << 2 > > Each bank contains at least 6 registers to be configured, if one bank > has more than 16 gpios, an extra P_PADCTRL_GPIO[X]_DS_EXT is included. > Between two adjacent P_PADCTRL_GPIO[X]_I, there is an offset 0x10, that > is to say, for third bank, the offsets will be 0x20,0x21,0x22,0x23,0x24 > ,0x25 according to above register layout. For previous chips, registers > are grouped according to their functions while registers of A1 are > according to bank. > > Current Meson pinctrl driver can cover such change by using base address > of GPIO as that of drive-strength.While simply giving reg_ds = reg_pullen > make wrong value to reg_ds for Socs that do not support drive-strength > like AXG.To make things simple, add an extra dt parser function for > a1 or later chip and remain the old dt parser function for old Socs. > > Signed-off-by: Qianggui Song > --- > drivers/pinctrl/meson/pinctrl-meson.c | 16 +++++++++++++++- > drivers/pinctrl/meson/pinctrl-meson.h | 7 +++++++ > 2 files changed, 22 insertions(+), 1 deletion(-) > > diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c > index 8bba9d053d9f..e8f6298fc96a 100644 > --- a/drivers/pinctrl/meson/pinctrl-meson.c > +++ b/drivers/pinctrl/meson/pinctrl-meson.c > @@ -695,6 +695,17 @@ static int meson_pinctrl_parse_dt(struct meson_pinctrl *pc, > return 0; > } > > +int meson_pinctrl_parse_dt_extra(struct meson_pinctrl *pc, > + struct device_node *node) This function is the fixup for the a1 family, AFAICT. It should be named as such and it belong in pinctrl-meson-a1.c Every controller performing fixups should have their function as well: (1) AO of gxbb, gxl and axg (2) AO of g12 and sm > +{ > + int ret; > + > + ret = meson_pinctrl_parse_dt(pc, node); As said in previous review, meson_pinctrl_parse_dt() should be called for every SoC to parse the *available* regions. The fixup, if necessary, will be done by providing a callback IOW, please: * rework meson_pinctrl_parse_dt() to only parse the avaialble region * don't call meson_pinctrl_parse_dt() from the extra function * provided the extra function for the AO controllers of the other SoCs > + pc->reg_ds = pc->reg_pullen; > + > + return ret; > +} > + > int meson_pinctrl_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > @@ -708,7 +719,10 @@ int meson_pinctrl_probe(struct platform_device *pdev) > pc->dev = dev; > pc->data = (struct meson_pinctrl_data *) of_device_get_match_data(dev); > > - ret = meson_pinctrl_parse_dt(pc, dev->of_node); > + if (pc->data->parse_dt) > + ret = pc->data->parse_dt(pc, dev->of_node); > + else > + ret = meson_pinctrl_parse_dt(pc, dev->of_node); > if (ret) > return ret; > > diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h > index c696f3241a36..0cd6a869cae3 100644 > --- a/drivers/pinctrl/meson/pinctrl-meson.h > +++ b/drivers/pinctrl/meson/pinctrl-meson.h > @@ -11,6 +11,8 @@ > #include > #include > > +struct meson_pinctrl; > + > /** > * struct meson_pmx_group - a pinmux group > * > @@ -114,6 +116,7 @@ struct meson_pinctrl_data { > unsigned int num_banks; > const struct pinmux_ops *pmx_ops; > void *pmx_data; > + int (*parse_dt)(struct meson_pinctrl *pc, struct device_node *node); > }; > > struct meson_pinctrl { > @@ -171,3 +174,7 @@ int meson_pmx_get_groups(struct pinctrl_dev *pcdev, > > /* Common probe function */ > int meson_pinctrl_probe(struct platform_device *pdev); > + > +/* Extra dt parse function for register layout grouped by bank */ > +int meson_pinctrl_parse_dt_extra(struct meson_pinctrl *pc, > + struct device_node *node); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4711CA9EB6 for ; Wed, 23 Oct 2019 09:01:51 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id B94AF21872 for ; Wed, 23 Oct 2019 09:01:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="XLdJe4JK"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="uSGIcfd7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B94AF21872 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date: In-reply-to:Subject:To:From:References:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=ZIdnTx6bce+RZf4UwHo0jijcgmftPA0QHGB8o7V/wGY=; b=XLdJe4JKy2qSypaBS92ZIx/6xH u+6pKprqfFjGUsrnYlvrMwameggWWIDxLJ6xAYALwyIfmqXcC1BPNTR9sZKELaD7q3slrTY9Xxhjv gc1Fpug7A/R266bBWv3RVRYFmzBbyh8curXbKaZZgI4MSIQB0Y+kz0NN3LsMJKNdt5qXUenjlD1fL 0Ywn4Okem6qQzOhNKoeWKyftAfpdqI4TTPQRc495gxxa1lkqmhrWX44G9z6eMLyyBPPd0Fic7EDLc mHrxhbI8Jhk3L0EWx6Q4Vx6SEUoYB5X03LKWPJloKcrVaTRNdZq3UWHPASQ3C9/JRLjx1oAYJPFRy Jix148zg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iNCWY-0005Nr-Gf; Wed, 23 Oct 2019 09:01:46 +0000 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iNCWK-0005Do-0G for linux-amlogic@lists.infradead.org; Wed, 23 Oct 2019 09:01:34 +0000 Received: by mail-wm1-x342.google.com with SMTP id q13so10242888wmj.0 for ; Wed, 23 Oct 2019 02:01:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version; bh=aR0VSMnP4KkB+mkerf85b81/hB0bJCp5/Vkdc4wc6hA=; b=uSGIcfd72Gshs/oBfZ73FZmP5Z3y0RcKof9RadYgq/hhgMK47xtr7i8SxIZBsLfb/n mp4YdG1UypVdLUHfEmn41sQN3W9BkxDBLPGfII2edwAjhTCFG/HEfUkwMERiXayvpQ4o zwbahWSgVszS4hzwda+y5F0MlcuRfUcQrRHRsIOnsFe41ZR9Pc6ptIjfQG8Yt1hp0hOf bJJgAJ5BqiYXNQbbPCQ4MYz2o76PN91r6UgUBywdmBv0UFQNRJL7zT76lkh5uq2jpOUi j2spGC3yrUV8zaYWmmDQoalQtOoto70fVYiPSzN//fsavpigJ2TXhrW1P76hPwvVgcxY f1tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version; bh=aR0VSMnP4KkB+mkerf85b81/hB0bJCp5/Vkdc4wc6hA=; b=V5ALAOnMuLvl117GvV1+V1rRIAoTBFjngtivMCDaGS80UWp6zYq/3Wk7roVzMnrkBJ DI88y8R7+37iHSzYLAY835iFPoqfphhdfaZZWpuuTKCU5qE0P5ypKSyoCT2ApUHqLjIk x5Kg7TZzPGgFB0gJUkajtqImAGFTYENBVMVhXZvjt4NSHP88StAwGNCbMiMBU2CDqC7v hJq9n1NYtM2DT3a6OseJayMDhfy7KUPRYaQHLicLk9t9edW9FYkt4EBnKPN425ea7Mh9 dMPC21ognfCTcrJkkyQsJBySj+uvZBvrbIFj7p9Z62UMaiAvWGKKMFOxxNqDXYNoynr0 xxvw== X-Gm-Message-State: APjAAAXIXG+wnDIV02i0sv+2NbmHgAF89n5pcreIQn1dLxHQNMlklRDG F+FdGp84q+jhGzQrX2lkuiOhZA== X-Google-Smtp-Source: APXvYqyvQ8r2oQMybF8/Pj+naPcy6tRL9yoDeCNtwtwGQx9KxbqXPr4d7jlhu11P/1qFpoeyvtA1VQ== X-Received: by 2002:a1c:7911:: with SMTP id l17mr6675287wme.21.1571821290130; Wed, 23 Oct 2019 02:01:30 -0700 (PDT) Received: from localhost (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id q25sm5833925wra.3.2019.10.23.02.01.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2019 02:01:29 -0700 (PDT) References: <1571050492-6598-1-git-send-email-qianggui.song@amlogic.com> <1571050492-6598-3-git-send-email-qianggui.song@amlogic.com> User-agent: mu4e 1.3.3; emacs 26.2 From: Jerome Brunet To: Qianggui Song , Linus Walleij , linux-gpio@vger.kernel.org Subject: Re: [PATCH v3 2/4] pinctrl: meson: add a new dt parse callback for Meson-A series SoCs In-reply-to: <1571050492-6598-3-git-send-email-qianggui.song@amlogic.com> Date: Wed, 23 Oct 2019 11:01:28 +0200 Message-ID: <1j4kzzvnrr.fsf@starbuckisacylon.baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191023_020132_107786_EEFD67FA X-CRM114-Status: GOOD ( 18.75 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Hanjie Lin , Jianxin Pan , Neil Armstrong , Martin Blumenstingl , Kevin Hilman , linux-kernel@vger.kernel.org, Rob Herring , linux-arm-kernel@lists.infradead.org, Carlo Caione , linux-amlogic@lists.infradead.org, Xingyu Chen Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org On Mon 14 Oct 2019 at 12:54, Qianggui Song wrote: > Meson A1 Soc share the same register layout of pinmux with previous > Meson-G12A, however there is difference for gpio and pin config register > in A1. The main difference is that registers before A1 are grouped by > function while those of A1 are by bank. The new register layout is as > below: > > /* first bank */ /* addr */ > - P_PADCTRL_GPIOP_I base + 0x00 << 2 > - P_PADCTRL_GPIOP_O base + 0x01 << 2 > - P_PADCTRL_GPIOP_OEN base + 0x02 << 2 > - P_PADCTRL_GPIOP_PULL_EN base + 0x03 << 2 > - P_PADCTRL_GPIOP_PULL_UP base + 0x04 << 2 > - P_PADCTRL_GPIOP_DS base + 0x05 << 2 > > /* second bank */ > - P_PADCTRL_GPIOB_I base + 0x10 << 2 > - P_PADCTRL_GPIOB_O base + 0x11 << 2 > - P_PADCTRL_GPIOB_OEN base + 0x12 << 2 > - P_PADCTRL_GPIOB_PULL_EN base + 0x13 << 2 > - P_PADCTRL_GPIOB_PULL_UP base + 0x14 << 2 > - P_PADCTRL_GPIOB_DS base + 0x15 << 2 > > Each bank contains at least 6 registers to be configured, if one bank > has more than 16 gpios, an extra P_PADCTRL_GPIO[X]_DS_EXT is included. > Between two adjacent P_PADCTRL_GPIO[X]_I, there is an offset 0x10, that > is to say, for third bank, the offsets will be 0x20,0x21,0x22,0x23,0x24 > ,0x25 according to above register layout. For previous chips, registers > are grouped according to their functions while registers of A1 are > according to bank. > > Current Meson pinctrl driver can cover such change by using base address > of GPIO as that of drive-strength.While simply giving reg_ds = reg_pullen > make wrong value to reg_ds for Socs that do not support drive-strength > like AXG.To make things simple, add an extra dt parser function for > a1 or later chip and remain the old dt parser function for old Socs. > > Signed-off-by: Qianggui Song > --- > drivers/pinctrl/meson/pinctrl-meson.c | 16 +++++++++++++++- > drivers/pinctrl/meson/pinctrl-meson.h | 7 +++++++ > 2 files changed, 22 insertions(+), 1 deletion(-) > > diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c > index 8bba9d053d9f..e8f6298fc96a 100644 > --- a/drivers/pinctrl/meson/pinctrl-meson.c > +++ b/drivers/pinctrl/meson/pinctrl-meson.c > @@ -695,6 +695,17 @@ static int meson_pinctrl_parse_dt(struct meson_pinctrl *pc, > return 0; > } > > +int meson_pinctrl_parse_dt_extra(struct meson_pinctrl *pc, > + struct device_node *node) This function is the fixup for the a1 family, AFAICT. It should be named as such and it belong in pinctrl-meson-a1.c Every controller performing fixups should have their function as well: (1) AO of gxbb, gxl and axg (2) AO of g12 and sm > +{ > + int ret; > + > + ret = meson_pinctrl_parse_dt(pc, node); As said in previous review, meson_pinctrl_parse_dt() should be called for every SoC to parse the *available* regions. The fixup, if necessary, will be done by providing a callback IOW, please: * rework meson_pinctrl_parse_dt() to only parse the avaialble region * don't call meson_pinctrl_parse_dt() from the extra function * provided the extra function for the AO controllers of the other SoCs > + pc->reg_ds = pc->reg_pullen; > + > + return ret; > +} > + > int meson_pinctrl_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > @@ -708,7 +719,10 @@ int meson_pinctrl_probe(struct platform_device *pdev) > pc->dev = dev; > pc->data = (struct meson_pinctrl_data *) of_device_get_match_data(dev); > > - ret = meson_pinctrl_parse_dt(pc, dev->of_node); > + if (pc->data->parse_dt) > + ret = pc->data->parse_dt(pc, dev->of_node); > + else > + ret = meson_pinctrl_parse_dt(pc, dev->of_node); > if (ret) > return ret; > > diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h > index c696f3241a36..0cd6a869cae3 100644 > --- a/drivers/pinctrl/meson/pinctrl-meson.h > +++ b/drivers/pinctrl/meson/pinctrl-meson.h > @@ -11,6 +11,8 @@ > #include > #include > > +struct meson_pinctrl; > + > /** > * struct meson_pmx_group - a pinmux group > * > @@ -114,6 +116,7 @@ struct meson_pinctrl_data { > unsigned int num_banks; > const struct pinmux_ops *pmx_ops; > void *pmx_data; > + int (*parse_dt)(struct meson_pinctrl *pc, struct device_node *node); > }; > > struct meson_pinctrl { > @@ -171,3 +174,7 @@ int meson_pmx_get_groups(struct pinctrl_dev *pcdev, > > /* Common probe function */ > int meson_pinctrl_probe(struct platform_device *pdev); > + > +/* Extra dt parse function for register layout grouped by bank */ > +int meson_pinctrl_parse_dt_extra(struct meson_pinctrl *pc, > + struct device_node *node); _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic