Received-SPF: pass (google.com: domain of linux-kernel+bounces-194002-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Precedence: bulk
MIME-Version: 1.0
References: <Zktwd4Y8zu6XSGaE@Z926fQmE5jqhFMgp6>
In-Reply-To: <Zktwd4Y8zu6XSGaE@Z926fQmE5jqhFMgp6>
From: Bartosz Golaszewski <brgl@bgdev.pl>
Date: Wed, 29 May 2024 13:17:43 +0200
Message-ID: <CAMRc=Md9osTYohZU_CJkaU8zto5P4v9_Nfp7quqVXm_YM+2Y0Q@mail.gmail.com>
Subject: Re: [PATCH] gpio-syscon: do not report bogus error
To: linus.walleij@linaro.org, brgl@bgdev.pl, linux-gpio@vger.kernel.org, 
	linux-kernel@vger.kernel.org, etienne.buira@free.fr
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Mon, May 20, 2024 at 5:48=E2=80=AFPM Etienne Buira <etienne.buira@free.f=
r> wrote:
>
> Do not issue "can't read the data register offset!" when gpio,syscon-dev
> is not set albeit unneeded.  gpio-syscon is used with rk3328 chip, but
> this iomem region is documented in
> Documentation/devicetree/bindings/gpio/rockchip,rk3328-grf-gpio.yaml and
> does not require gpio,syscon-dev setting.
>
> v3:
>   - moved from flag to parent regmap detection
>

Don't make the changelog part of the commit message, please.

Bart

> Signed-off-by: Etienne Buira <etienne.buira@free.fr>
> ---
>  drivers/gpio/gpio-syscon.c | 27 ++++++++++++++++-----------
>  1 file changed, 16 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpio/gpio-syscon.c b/drivers/gpio/gpio-syscon.c
> index 6e1a2581e6ae..3a90a3a1caea 100644
> --- a/drivers/gpio/gpio-syscon.c
> +++ b/drivers/gpio/gpio-syscon.c
> @@ -208,6 +208,7 @@ static int syscon_gpio_probe(struct platform_device *=
pdev)
>         struct syscon_gpio_priv *priv;
>         struct device_node *np =3D dev->of_node;
>         int ret;
> +       bool use_parent_regmap =3D false;
>
>         priv =3D devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
>         if (!priv)
> @@ -216,24 +217,28 @@ static int syscon_gpio_probe(struct platform_device=
 *pdev)
>         priv->data =3D of_device_get_match_data(dev);
>
>         priv->syscon =3D syscon_regmap_lookup_by_phandle(np, "gpio,syscon=
-dev");
> -       if (IS_ERR(priv->syscon) && np->parent)
> +       if (IS_ERR(priv->syscon) && np->parent) {
>                 priv->syscon =3D syscon_node_to_regmap(np->parent);
> +               use_parent_regmap =3D true;
> +       }
>         if (IS_ERR(priv->syscon))
>                 return PTR_ERR(priv->syscon);
>
> -       ret =3D of_property_read_u32_index(np, "gpio,syscon-dev", 1,
> -                                        &priv->dreg_offset);
> -       if (ret)
> -               dev_err(dev, "can't read the data register offset!\n");
> +       if (!use_parent_regmap) {
> +               ret =3D of_property_read_u32_index(np, "gpio,syscon-dev",=
 1,
> +                                                &priv->dreg_offset);
> +               if (ret)
> +                       dev_err(dev, "can't read the data register offset=
!\n");
>
> -       priv->dreg_offset <<=3D 3;
> +               priv->dreg_offset <<=3D 3;
>
> -       ret =3D of_property_read_u32_index(np, "gpio,syscon-dev", 2,
> -                                        &priv->dir_reg_offset);
> -       if (ret)
> -               dev_dbg(dev, "can't read the dir register offset!\n");
> +               ret =3D of_property_read_u32_index(np, "gpio,syscon-dev",=
 2,
> +                                                &priv->dir_reg_offset);
> +               if (ret)
> +                       dev_dbg(dev, "can't read the dir register offset!=
\n");
>
> -       priv->dir_reg_offset <<=3D 3;
> +               priv->dir_reg_offset <<=3D 3;
> +       }
>
>         priv->chip.parent =3D dev;
>         priv->chip.owner =3D THIS_MODULE;
>
> base-commit: 4cece764965020c22cff7665b18a012006359095
> --
> 2.43.0
>