Add support for HiSilicon GPIO controller in embedded platform, which
boot from devicetree.
Signed-off-by: Weilong Chen <[email protected]>
---
Change since v1:
- Rename gpio-ascend910 to ascend910-gpio
Link: https://lore.kernel.org/lkml/[email protected]/t/#m39e195979c1f42a6327aba009428316607d033e2
drivers/gpio/Kconfig | 2 +-
drivers/gpio/gpio-hisi.c | 15 ++++++++++++++-
2 files changed, 15 insertions(+), 2 deletions(-)
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..92cf575f2eab 100644
--- a/drivers/gpio/gpio-hisi.c
+++ b/drivers/gpio/gpio-hisi.c
@@ -1,8 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-only
/* Copyright (c) 2020 HiSilicon Limited. */
+#include <linux/acpi.h>
#include <linux/gpio/driver.h>
#include <linux/module.h>
#include <linux/mod_devicetable.h>
+#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/property.h>
@@ -215,11 +217,21 @@ static void hisi_gpio_init_irq(struct hisi_gpio *hisi_gpio)
hisi_gpio_write_reg(chip, HISI_GPIO_INTCOMB_MASK_WX, 1);
}
+#ifdef CONFIG_ACPI
static const struct acpi_device_id hisi_gpio_acpi_match[] = {
{"HISI0184", 0},
{}
};
MODULE_DEVICE_TABLE(acpi, hisi_gpio_acpi_match);
+#endif
+
+#ifdef CONFIG_OF
+static const struct of_device_id hisi_gpio_dts_match[] = {
+ { .compatible = "hisilicon,ascend910-gpio", },
+ { }
+};
+MODULE_DEVICE_TABLE(of, hisi_gpio_dts_match);
+#endif
static void hisi_gpio_get_pdata(struct device *dev,
struct hisi_gpio *hisi_gpio)
@@ -310,7 +322,8 @@ static int hisi_gpio_probe(struct platform_device *pdev)
static struct platform_driver hisi_gpio_driver = {
.driver = {
.name = HISI_GPIO_DRIVER_NAME,
- .acpi_match_table = hisi_gpio_acpi_match,
+ .acpi_match_table = ACPI_PTR(hisi_gpio_acpi_match),
+ .of_match_table = of_match_ptr(hisi_gpio_dts_match),
},
.probe = hisi_gpio_probe,
};
--
2.31.GIT
Hi Weilong,
On 2022/10/28 10:24, Weilong Chen wrote:
> Add support for HiSilicon GPIO controller in embedded platform, which
> boot from devicetree.
>
> Signed-off-by: Weilong Chen <[email protected]>
> ---
> Change since v1:
> - Rename gpio-ascend910 to ascend910-gpio
> Link: https://lore.kernel.org/lkml/[email protected]/t/#m39e195979c1f42a6327aba009428316607d033e2
>
> drivers/gpio/Kconfig | 2 +-
> drivers/gpio/gpio-hisi.c | 15 ++++++++++++++-
> 2 files changed, 15 insertions(+), 2 deletions(-)
>
> 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..92cf575f2eab 100644
> --- a/drivers/gpio/gpio-hisi.c
> +++ b/drivers/gpio/gpio-hisi.c
> @@ -1,8 +1,10 @@
> // SPDX-License-Identifier: GPL-2.0-only
> /* Copyright (c) 2020 HiSilicon Limited. */
> +#include <linux/acpi.h>
> #include <linux/gpio/driver.h>
> #include <linux/module.h>
> #include <linux/mod_devicetable.h>
> +#include <linux/of.h>
> #include <linux/platform_device.h>
> #include <linux/property.h>
>
> @@ -215,11 +217,21 @@ static void hisi_gpio_init_irq(struct hisi_gpio *hisi_gpio)
> hisi_gpio_write_reg(chip, HISI_GPIO_INTCOMB_MASK_WX, 1);
> }
>
> +#ifdef CONFIG_ACPI
> static const struct acpi_device_id hisi_gpio_acpi_match[] = {
> {"HISI0184", 0},
> {}
> };
> MODULE_DEVICE_TABLE(acpi, hisi_gpio_acpi_match);
> +#endif
> +
> +#ifdef CONFIG_OF
> +static const struct of_device_id hisi_gpio_dts_match[] = {
> + { .compatible = "hisilicon,ascend910-gpio", },
> + { }
> +};
> +MODULE_DEVICE_TABLE(of, hisi_gpio_dts_match);
> +#endif
>
> static void hisi_gpio_get_pdata(struct device *dev,
> struct hisi_gpio *hisi_gpio)
> @@ -310,7 +322,8 @@ static int hisi_gpio_probe(struct platform_device *pdev)
> static struct platform_driver hisi_gpio_driver = {
> .driver = {
> .name = HISI_GPIO_DRIVER_NAME,
> - .acpi_match_table = hisi_gpio_acpi_match,
> + .acpi_match_table = ACPI_PTR(hisi_gpio_acpi_match),
> + .of_match_table = of_match_ptr(hisi_gpio_dts_match),
Andy has some comments about using of ACPI_PTR/of_match_ptr(), I think they also
apply here. [*]
The patch itself looks good to me.
[*] https://lore.kernel.org/linux-i2c/[email protected]/T/#m51adf2c1480a14ca0882784826f3168ddb83bf62
> },
> .probe = hisi_gpio_probe,
> };
>