From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: "open list:GPIO SUBSYSTEM" <linux-gpio@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Hoan Tran <hoan@os.amperecomputing.com>,
Serge Semin <fancer.lancer@gmail.com>,
Linus Walleij <linus.walleij@linaro.org>
Subject: Re: [PATCH v1 1/1] gpio: dwapb: clarify usage of the register file version
Date: Wed, 1 Dec 2021 09:29:54 +0100 [thread overview]
Message-ID: <CAMRc=MfC0wwa+T40eqUTx5w_X6ioqDbL3a7nnOTogpE2j4HVOg@mail.gmail.com> (raw)
In-Reply-To: <20211130164956.37540-1-andriy.shevchenko@linux.intel.com>
On Tue, Nov 30, 2021 at 5:50 PM Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
>
> First of all, it's obvious that different versions can't be provided
> simultaneously. Hence, versions can't be bit masks.
>
> Second, due to above we have to mask out the version field in the flags
> and only that can be evaluated against the certain version.
>
> Clarify all above by:
> - introducing GPIO_REG_OFFSET_V1 and GPIO_REG_OFFSET_MASK
> - replacing conditional to mask out bits and compare to a version
>
> Luckily there is no functional change (at least intended), so no need
> to backport this.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> drivers/gpio/gpio-dwapb.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
> index f98fa33e1679..ec0767d7800d 100644
> --- a/drivers/gpio/gpio-dwapb.c
> +++ b/drivers/gpio/gpio-dwapb.c
> @@ -53,7 +53,9 @@
> #define GPIO_SWPORT_DR_STRIDE 0x0c /* register stride 3*32 bits */
> #define GPIO_SWPORT_DDR_STRIDE 0x0c /* register stride 3*32 bits */
>
> +#define GPIO_REG_OFFSET_V1 0
> #define GPIO_REG_OFFSET_V2 1
> +#define GPIO_REG_OFFSET_MASK BIT(0)
>
> #define GPIO_INTMASK_V2 0x44
> #define GPIO_INTTYPE_LEVEL_V2 0x34
> @@ -141,7 +143,7 @@ static inline u32 gpio_reg_v2_convert(unsigned int offset)
>
> static inline u32 gpio_reg_convert(struct dwapb_gpio *gpio, unsigned int offset)
> {
> - if (gpio->flags & GPIO_REG_OFFSET_V2)
> + if ((gpio->flags & GPIO_REG_OFFSET_MASK) == GPIO_REG_OFFSET_V2)
> return gpio_reg_v2_convert(offset);
>
> return offset;
> @@ -668,15 +670,15 @@ static int dwapb_get_clks(struct dwapb_gpio *gpio)
> }
>
> static const struct of_device_id dwapb_of_match[] = {
> - { .compatible = "snps,dw-apb-gpio", .data = (void *)0},
> + { .compatible = "snps,dw-apb-gpio", .data = (void *)GPIO_REG_OFFSET_V1},
> { .compatible = "apm,xgene-gpio-v2", .data = (void *)GPIO_REG_OFFSET_V2},
> { /* Sentinel */ }
> };
> MODULE_DEVICE_TABLE(of, dwapb_of_match);
>
> static const struct acpi_device_id dwapb_acpi_match[] = {
> - {"HISI0181", 0},
> - {"APMC0D07", 0},
> + {"HISI0181", GPIO_REG_OFFSET_V1},
> + {"APMC0D07", GPIO_REG_OFFSET_V1},
> {"APMC0D81", GPIO_REG_OFFSET_V2},
> { }
> };
> --
> 2.33.0
>
Reviewed-by: Bartosz Golaszewski <brgl@bgdev.pl>
Please send it with your PR.
Bart
next prev parent reply other threads:[~2021-12-01 8:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-30 16:49 [PATCH v1 1/1] gpio: dwapb: clarify usage of the register file version Andy Shevchenko
2021-12-01 8:29 ` Bartosz Golaszewski [this message]
2021-12-01 13:12 ` Andy Shevchenko
2021-12-01 12:27 ` Serge Semin
2021-12-01 13:13 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAMRc=MfC0wwa+T40eqUTx5w_X6ioqDbL3a7nnOTogpE2j4HVOg@mail.gmail.com' \
--to=brgl@bgdev.pl \
--cc=andriy.shevchenko@linux.intel.com \
--cc=fancer.lancer@gmail.com \
--cc=hoan@os.amperecomputing.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).