Merge tag 'gpio-updates-for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / gpio / gpio-tegra186.c

diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c
index 05c90d7..c99858f 100644 (file)
--- a/drivers/gpio/gpio-tegra186.c
+++ b/drivers/gpio/gpio-tegra186.c
@@ -607,15 +607,21 @@ static int tegra186_gpio_probe(struct platform_device *pdev)
        if (!gpio)
                return -ENOMEM;
 
-       gpio->soc = of_device_get_match_data(&pdev->dev);
+       gpio->soc = device_get_match_data(&pdev->dev);
 
        gpio->secure = devm_platform_ioremap_resource_byname(pdev, "security");
-       if (IS_ERR(gpio->secure))
-               return PTR_ERR(gpio->secure);
+       if (IS_ERR(gpio->secure)) {
+               gpio->secure = devm_platform_ioremap_resource(pdev, 0);
+               if (IS_ERR(gpio->secure))
+                       return PTR_ERR(gpio->secure);
+       }
 
        gpio->base = devm_platform_ioremap_resource_byname(pdev, "gpio");
-       if (IS_ERR(gpio->base))
-               return PTR_ERR(gpio->base);
+       if (IS_ERR(gpio->base)) {
+               gpio->base = devm_platform_ioremap_resource(pdev, 1);
+               if (IS_ERR(gpio->base))
+                       return PTR_ERR(gpio->base);
+       }
 
        err = platform_irq_count(pdev);
        if (err < 0)
@@ -677,11 +683,13 @@ static int tegra186_gpio_probe(struct platform_device *pdev)
 
        gpio->gpio.names = (const char * const *)names;
 
+#if defined(CONFIG_OF_GPIO)
        gpio->gpio.of_node = pdev->dev.of_node;
        gpio->gpio.of_gpio_n_cells = 2;
        gpio->gpio.of_xlate = tegra186_gpio_of_xlate;
+#endif /* CONFIG_OF_GPIO */
 
-       gpio->intc.name = pdev->dev.of_node->name;
+       gpio->intc.name = dev_name(&pdev->dev);
        gpio->intc.irq_ack = tegra186_irq_ack;
        gpio->intc.irq_mask = tegra186_irq_mask;
        gpio->intc.irq_unmask = tegra186_irq_unmask;
@@ -893,10 +901,20 @@ static const struct of_device_id tegra186_gpio_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, tegra186_gpio_of_match);
 
+static const struct acpi_device_id  tegra186_gpio_acpi_match[] = {
+       { .id = "NVDA0108", .driver_data = (kernel_ulong_t)&tegra186_main_soc },
+       { .id = "NVDA0208", .driver_data = (kernel_ulong_t)&tegra186_aon_soc },
+       { .id = "NVDA0308", .driver_data = (kernel_ulong_t)&tegra194_main_soc },
+       { .id = "NVDA0408", .driver_data = (kernel_ulong_t)&tegra194_aon_soc },
+       {}
+};
+MODULE_DEVICE_TABLE(acpi, tegra186_gpio_acpi_match);
+
 static struct platform_driver tegra186_gpio_driver = {
        .driver = {
                .name = "tegra186-gpio",
                .of_match_table = tegra186_gpio_of_match,
+               .acpi_match_table = tegra186_gpio_acpi_match,
        },
        .probe = tegra186_gpio_probe,
 };