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@xxxxxxxxxx> Reviewed-by: Yicong Yang <yangyicong@xxxxxxxxxxxxx> > --- > Change since v2: > - Drop wrong use ACPI_PTR/of_match_ptr > Link: https://lore.kernel.org/lkml/20221028022453.163186-1-chenweilong@xxxxxxxxxx/ > > 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, > }; >
