diff mbox series

[next,v3,1/2] gpio: hisi: Add initial device tree support

Message ID	20221101082442.263448-1-chenweilong@huawei.com
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; From: Weilong Chen <chenweilong@huawei.com> To: <chenweilong@huawei.com>, <f.fangjian@huawei.com>, <linus.walleij@linaro.org>, <brgl@bgdev.pl>, <yangyicong@hisilicon.com>, <xuwei5@huawei.com>, <robh+dt@kernel.org>, <krzysztof.kozlowski+dt@linaro.org> CC: <linux-gpio@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org> Subject: [PATCH next v3 1/2] gpio: hisi: Add initial device tree support Date: Tue, 1 Nov 2022 16:24:41 +0800 Message-ID: <20221101082442.263448-1-chenweilong@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII Precedence: bulk
Series	[next,v3,1/2] gpio: hisi: Add initial device tree support \| [next,v3,1/2] gpio: hisi: Add initial device tree support [next,v3,2/2] dt-bindings: gpio: add entry for hisilicon,ascend910-gpio

Commit Message

chenweilong Nov. 1, 2022, 8:24 a.m. UTC

  Add support for HiSilicon GPIO controller in embedded platform, which
boot from devicetree.

Signed-off-by: Weilong Chen <chenweilong@huawei.com>
---
Change since v2:
- Drop wrong use ACPI_PTR/of_match_ptr
Link: https://lore.kernel.org/lkml/20221028022453.163186-1-chenweilong@huawei.com/

 drivers/gpio/Kconfig     | 2 +-
 drivers/gpio/gpio-hisi.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

Comments

Bartosz Golaszewski Nov. 2, 2022, 12:49 p.m. UTC | #1

On Tue, Nov 1, 2022 at 9:17 AM Weilong Chen <chenweilong@huawei.com> wrote:
>
> Add support for HiSilicon GPIO controller in embedded platform, which
> boot from devicetree.
>
> Signed-off-by: Weilong Chen <chenweilong@huawei.com>
> ---

This is v3 - just like the previous version. Are there any changes?

Also: you don't need that -next in your patch tag.

Bart

chenweilong Nov. 3, 2022, 1:07 a.m. UTC | #2

On 2022/11/2 20:49, Bartosz Golaszewski wrote:
> On Tue, Nov 1, 2022 at 9:17 AM Weilong Chen <chenweilong@huawei.com> wrote:
>> Add support for HiSilicon GPIO controller in embedded platform, which
>> boot from devicetree.
>>
>> Signed-off-by: Weilong Chen <chenweilong@huawei.com>
>> ---
> This is v3 - just like the previous version. Are there any changes?

Hi, v3 is the same with v2, but v2 had a lot change to v1.

Link for v2: https://lore.kernel.org/lkml/20221028022453.163186-2-chenweilong@huawei.com/

There's a change log in commit message to describe the changes.


I send v3 patch to fix problem of the other patch in the series:

Link is: https://lore.kernel.org/lkml/791619d1-a227-477a-99c6-7ba15b4a28df@huawei.com/

>
> Also: you don't need that -next in your patch tag.

Thanks for the advice, I will adjust it in subsequent  work.

Thanks.

>
> Bart
>
> .

Jay Fang Nov. 3, 2022, 8:40 a.m. UTC | #3

On 2022/11/1 16:24, Weilong Chen wrote:
> Add support for HiSilicon GPIO controller in embedded platform, which
> boot from devicetree.
> 
> Signed-off-by: Weilong Chen <chenweilong@huawei.com>
> ---
> Change since v2:
> - Drop wrong use ACPI_PTR/of_match_ptr
> Link: https://lore.kernel.org/lkml/20221028022453.163186-1-chenweilong@huawei.com/
> 
>  drivers/gpio/Kconfig     | 2 +-
>  drivers/gpio/gpio-hisi.c | 7 +++++++
>  2 files changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
> index e034f752e7ce..71a7880af59d 100644
> --- a/drivers/gpio/Kconfig
> +++ b/drivers/gpio/Kconfig
> @@ -310,7 +310,7 @@ config GPIO_GRGPIO
>  
>  config GPIO_HISI
>  	tristate "HiSilicon GPIO controller driver"
> -	depends on (ARM64 && ACPI) || COMPILE_TEST
> +	depends on ARM64 || COMPILE_TEST
>  	select GPIO_GENERIC
>  	select GPIOLIB_IRQCHIP
>  	help
> diff --git a/drivers/gpio/gpio-hisi.c b/drivers/gpio/gpio-hisi.c
> index 3caabef5c7a2..55bd69043bf4 100644
> --- a/drivers/gpio/gpio-hisi.c
> +++ b/drivers/gpio/gpio-hisi.c
> @@ -221,6 +221,12 @@ static const struct acpi_device_id hisi_gpio_acpi_match[] = {
>  };
>  MODULE_DEVICE_TABLE(acpi, hisi_gpio_acpi_match);
>  
> +static const struct of_device_id hisi_gpio_dts_match[] = {
> +	{ .compatible = "hisilicon,ascend910-gpio", },
> +	{ }
> +};
> +MODULE_DEVICE_TABLE(of, hisi_gpio_dts_match);
> +
>  static void hisi_gpio_get_pdata(struct device *dev,
>  				struct hisi_gpio *hisi_gpio)
>  {
> @@ -311,6 +317,7 @@ static struct platform_driver hisi_gpio_driver = {
>  	.driver		= {
>  		.name	= HISI_GPIO_DRIVER_NAME,
>  		.acpi_match_table = hisi_gpio_acpi_match,
> +		.of_match_table = hisi_gpio_dts_match,
>  	},
>  	.probe		= hisi_gpio_probe,
>  };
> 
Acked-by: Jay Fang <f.fangjian@huawei.com>

chenweilong Nov. 3, 2022, 8:50 a.m. UTC | #4

On 2022/11/1 16:24, Weilong Chen wrote:

This is the latest version for the patch, I used the v3 version number incorrectly.
Sorry for the mistake. I will pay attention next time.

> Add support for HiSilicon GPIO controller in embedded platform, which
> boot from devicetree.
>
> Signed-off-by: Weilong Chen <chenweilong@huawei.com>
> ---
> Change since v2:
> - Drop wrong use ACPI_PTR/of_match_ptr
> Link: https://lore.kernel.org/lkml/20221028022453.163186-1-chenweilong@huawei.com/
>
>  drivers/gpio/Kconfig     | 2 +-
>  drivers/gpio/gpio-hisi.c | 7 +++++++
>  2 files changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
> index e034f752e7ce..71a7880af59d 100644
> --- a/drivers/gpio/Kconfig
> +++ b/drivers/gpio/Kconfig
> @@ -310,7 +310,7 @@ config GPIO_GRGPIO
>  
>  config GPIO_HISI
>  	tristate "HiSilicon GPIO controller driver"
> -	depends on (ARM64 && ACPI) || COMPILE_TEST
> +	depends on ARM64 || COMPILE_TEST
>  	select GPIO_GENERIC
>  	select GPIOLIB_IRQCHIP
>  	help
> diff --git a/drivers/gpio/gpio-hisi.c b/drivers/gpio/gpio-hisi.c
> index 3caabef5c7a2..55bd69043bf4 100644
> --- a/drivers/gpio/gpio-hisi.c
> +++ b/drivers/gpio/gpio-hisi.c
> @@ -221,6 +221,12 @@ static const struct acpi_device_id hisi_gpio_acpi_match[] = {
>  };
>  MODULE_DEVICE_TABLE(acpi, hisi_gpio_acpi_match);
>  
> +static const struct of_device_id hisi_gpio_dts_match[] = {
> +	{ .compatible = "hisilicon,ascend910-gpio", },
> +	{ }
> +};
> +MODULE_DEVICE_TABLE(of, hisi_gpio_dts_match);
> +
>  static void hisi_gpio_get_pdata(struct device *dev,
>  				struct hisi_gpio *hisi_gpio)
>  {
> @@ -311,6 +317,7 @@ static struct platform_driver hisi_gpio_driver = {
>  	.driver		= {
>  		.name	= HISI_GPIO_DRIVER_NAME,
>  		.acpi_match_table = hisi_gpio_acpi_match,
> +		.of_match_table = hisi_gpio_dts_match,
>  	},
>  	.probe		= hisi_gpio_probe,
>  };

Yicong Yang Nov. 3, 2022, 12:19 p.m. UTC | #5

On 2022/11/1 16:24, Weilong Chen wrote:
> Add support for HiSilicon GPIO controller in embedded platform, which
> boot from devicetree.
> 
> Signed-off-by: Weilong Chen <chenweilong@huawei.com>

Reviewed-by: Yicong Yang <yangyicong@hisilicon.com>

> ---
> Change since v2:
> - Drop wrong use ACPI_PTR/of_match_ptr
> Link: https://lore.kernel.org/lkml/20221028022453.163186-1-chenweilong@huawei.com/
> 
>  drivers/gpio/Kconfig     | 2 +-
>  drivers/gpio/gpio-hisi.c | 7 +++++++
>  2 files changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
> index e034f752e7ce..71a7880af59d 100644
> --- a/drivers/gpio/Kconfig
> +++ b/drivers/gpio/Kconfig
> @@ -310,7 +310,7 @@ config GPIO_GRGPIO
>  
>  config GPIO_HISI
>  	tristate "HiSilicon GPIO controller driver"
> -	depends on (ARM64 && ACPI) || COMPILE_TEST
> +	depends on ARM64 || COMPILE_TEST
>  	select GPIO_GENERIC
>  	select GPIOLIB_IRQCHIP
>  	help
> diff --git a/drivers/gpio/gpio-hisi.c b/drivers/gpio/gpio-hisi.c
> index 3caabef5c7a2..55bd69043bf4 100644
> --- a/drivers/gpio/gpio-hisi.c
> +++ b/drivers/gpio/gpio-hisi.c
> @@ -221,6 +221,12 @@ static const struct acpi_device_id hisi_gpio_acpi_match[] = {
>  };
>  MODULE_DEVICE_TABLE(acpi, hisi_gpio_acpi_match);
>  
> +static const struct of_device_id hisi_gpio_dts_match[] = {
> +	{ .compatible = "hisilicon,ascend910-gpio", },
> +	{ }
> +};
> +MODULE_DEVICE_TABLE(of, hisi_gpio_dts_match);
> +
>  static void hisi_gpio_get_pdata(struct device *dev,
>  				struct hisi_gpio *hisi_gpio)
>  {
> @@ -311,6 +317,7 @@ static struct platform_driver hisi_gpio_driver = {
>  	.driver		= {
>  		.name	= HISI_GPIO_DRIVER_NAME,
>  		.acpi_match_table = hisi_gpio_acpi_match,
> +		.of_match_table = hisi_gpio_dts_match,
>  	},
>  	.probe		= hisi_gpio_probe,
>  };
>

Bartosz Golaszewski Nov. 7, 2022, 8:37 p.m. UTC | #6

On Thu, Nov 3, 2022 at 9:51 AM chenweilong <chenweilong@huawei.com> wrote:
>
> On 2022/11/1 16:24, Weilong Chen wrote:
>
> This is the latest version for the patch, I used the v3 version number incorrectly.
> Sorry for the mistake. I will pay attention next time.
>
> > Add support for HiSilicon GPIO controller in embedded platform, which
> > boot from devicetree.
> >
> > Signed-off-by: Weilong Chen <chenweilong@huawei.com>
> > ---
> > Change since v2:
> > - Drop wrong use ACPI_PTR/of_match_ptr
> > Link: https://lore.kernel.org/lkml/20221028022453.163186-1-chenweilong@huawei.com/
> >
> >  drivers/gpio/Kconfig     | 2 +-
> >  drivers/gpio/gpio-hisi.c | 7 +++++++
> >  2 files changed, 8 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
> > index e034f752e7ce..71a7880af59d 100644
> > --- a/drivers/gpio/Kconfig
> > +++ b/drivers/gpio/Kconfig
> > @@ -310,7 +310,7 @@ config GPIO_GRGPIO
> >
> >  config GPIO_HISI
> >       tristate "HiSilicon GPIO controller driver"
> > -     depends on (ARM64 && ACPI) || COMPILE_TEST
> > +     depends on ARM64 || COMPILE_TEST
> >       select GPIO_GENERIC
> >       select GPIOLIB_IRQCHIP
> >       help
> > diff --git a/drivers/gpio/gpio-hisi.c b/drivers/gpio/gpio-hisi.c
> > index 3caabef5c7a2..55bd69043bf4 100644
> > --- a/drivers/gpio/gpio-hisi.c
> > +++ b/drivers/gpio/gpio-hisi.c
> > @@ -221,6 +221,12 @@ static const struct acpi_device_id hisi_gpio_acpi_match[] = {
> >  };
> >  MODULE_DEVICE_TABLE(acpi, hisi_gpio_acpi_match);
> >
> > +static const struct of_device_id hisi_gpio_dts_match[] = {
> > +     { .compatible = "hisilicon,ascend910-gpio", },
> > +     { }
> > +};
> > +MODULE_DEVICE_TABLE(of, hisi_gpio_dts_match);
> > +
> >  static void hisi_gpio_get_pdata(struct device *dev,
> >                               struct hisi_gpio *hisi_gpio)
> >  {
> > @@ -311,6 +317,7 @@ static struct platform_driver hisi_gpio_driver = {
> >       .driver         = {
> >               .name   = HISI_GPIO_DRIVER_NAME,
> >               .acpi_match_table = hisi_gpio_acpi_match,
> > +             .of_match_table = hisi_gpio_dts_match,
> >       },
> >       .probe          = hisi_gpio_probe,
> >  };
>
>

I applied both, but reversed the order as dt bindings should come first. Thanks!

Bart

diff mbox series

Patch

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index e034f752e7ce..71a7880af59d 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -310,7 +310,7 @@  config GPIO_GRGPIO
 
 config GPIO_HISI
 	tristate "HiSilicon GPIO controller driver"
-	depends on (ARM64 && ACPI) || COMPILE_TEST
+	depends on ARM64 || COMPILE_TEST
 	select GPIO_GENERIC
 	select GPIOLIB_IRQCHIP
 	help
diff --git a/drivers/gpio/gpio-hisi.c b/drivers/gpio/gpio-hisi.c
index 3caabef5c7a2..55bd69043bf4 100644
--- a/drivers/gpio/gpio-hisi.c
+++ b/drivers/gpio/gpio-hisi.c
@@ -221,6 +221,12 @@  static const struct acpi_device_id hisi_gpio_acpi_match[] = {
 };
 MODULE_DEVICE_TABLE(acpi, hisi_gpio_acpi_match);
 
+static const struct of_device_id hisi_gpio_dts_match[] = {
+	{ .compatible = "hisilicon,ascend910-gpio", },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, hisi_gpio_dts_match);
+
 static void hisi_gpio_get_pdata(struct device *dev,
 				struct hisi_gpio *hisi_gpio)
 {
@@ -311,6 +317,7 @@  static struct platform_driver hisi_gpio_driver = {
 	.driver		= {
 		.name	= HISI_GPIO_DRIVER_NAME,
 		.acpi_match_table = hisi_gpio_acpi_match,
+		.of_match_table = hisi_gpio_dts_match,
 	},
 	.probe		= hisi_gpio_probe,
 };