gpio: hisi: Add initial device tree support

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

Signed-off-by: Weilong Chen <chenweilong@huawei.com>
Acked-by: Jay Fang <f.fangjian@huawei.com>
Reviewed-by: Yicong Yang <yangyicong@hisilicon.com>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 8c756cb..4bfedb0 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -319,7 +319,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 3caabef..55bd690 100644 (file)
--- 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,
 };