Add support for HiSilicon GPIO controller in embedded platform, which
boot from devicetree.
Signed-off-by: Weilong Chen <[email protected]>
---
Change since v2:
- No change
Link: https://lore.kernel.org/lkml/[email protected]/#r
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
Add the new compatible for HiSilicon gpio controller driver.
Signed-off-by: Weilong Chen <[email protected]>
---
Change since v2:
- Drop "|" in description
- Same style of quotes
- Same order properties
Link: https://lore.kernel.org/lkml/[email protected]/
.../gpio/hisilicon,ascend910-gpio.yaml | 56 +++++++++++++++++++
MAINTAINERS | 1 +
2 files changed, 57 insertions(+)
create mode 100644 Documentation/devicetree/bindings/gpio/hisilicon,ascend910-gpio.yaml
diff --git a/Documentation/devicetree/bindings/gpio/hisilicon,ascend910-gpio.yaml b/Documentation/devicetree/bindings/gpio/hisilicon,ascend910-gpio.yaml
new file mode 100644
index 000000000000..735d97d645a0
--- /dev/null
+++ b/Documentation/devicetree/bindings/gpio/hisilicon,ascend910-gpio.yaml
@@ -0,0 +1,56 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/gpio/hisilicon,ascend910-gpio.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: HiSilicon common GPIO controller
+
+maintainers:
+ - Jay Fang <[email protected]>
+
+description:
+ The HiSilicon common GPIO controller can be used for many different
+ types of SoC such as Huawei Ascend AI series chips.
+
+properties:
+ compatible:
+ const: hisilicon,ascend910-gpio
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ maxItems: 1
+
+ gpio-controller: true
+
+ "#gpio-cells":
+ const: 2
+
+ ngpios:
+ minimum: 1
+ maximum: 32
+
+required:
+ - compatible
+ - reg
+ - interrupts
+ - gpio-controller
+ - "#gpio-cells"
+ - ngpios
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+
+ gpio@840d0000 {
+ compatible = "hisilicon,ascend910-gpio";
+ reg = <0x840d0000 0x1000>;
+ ngpios = <32>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
+ };
diff --git a/MAINTAINERS b/MAINTAINERS
index d42e34d1e8e2..74ac2e7a8e4b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9212,6 +9212,7 @@ HISILICON GPIO DRIVER
M: Jay Fang <[email protected]>
L: [email protected]
S: Maintained
+F: Documentation/devicetree/bindings/gpio/hisilicon,ascend910-gpio.yaml
F: drivers/gpio/gpio-hisi.c
HISILICON HIGH PERFORMANCE RSA ENGINE DRIVER (HPRE)
--
2.31.GIT
On 2022/10/29 19:35, 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 v2:
> - No change
> Link: https://lore.kernel.org/lkml/[email protected]/#r
>
> 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,
> };
>
Acked-by: Jay Fang <[email protected]>