From: Akhil R <akhilrajeev@nvidia.com>
To: <akhilrajeev@nvidia.com>,
Linus Walleij <linus.walleij@linaro.org>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>
Cc: <linux-gpio@vger.kernel.org>, <linux-tegra@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
Mikko Perttunen <mperttunen@nvidia.com>,
Laxman Dewangan <ldewangan@nvidia.com>,
Suresh Mangipudi <smangipudi@nvidia.com>,
Krishna Yarlagadda <kyarlagadda@nvidia.com>
Subject: [PATCH] gpio: tegra186: Add ACPI support
Date: Thu, 17 Jun 2021 15:35:51 +0530 [thread overview]
Message-ID: <1623924351-22489-1-git-send-email-akhilrajeev@nvidia.com> (raw)
From: Akhil Rajeev <akhilrajeev@nvidia.com>
Add ACPI module ID to probe the driver from the ACPI based bootloader
firmware.
Signed-off-by: Akhil Rajeev <akhilrajeev@nvidia.com>
---
drivers/gpio/gpio-tegra186.c | 35 ++++++++++++++++++++++++++++-------
1 file changed, 28 insertions(+), 7 deletions(-)
diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c
index 1bd9e44..c8051be 100644
--- a/drivers/gpio/gpio-tegra186.c
+++ b/drivers/gpio/gpio-tegra186.c
@@ -5,6 +5,7 @@
* Author: Thierry Reding <treding@nvidia.com>
*/
+#include <linux/acpi.h>
#include <linux/gpio/driver.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
@@ -620,13 +621,18 @@ 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);
+ if (has_acpi_companion(&pdev->dev)) {
+ gpio->secure = devm_platform_ioremap_resource(pdev, 0);
+ gpio->base = devm_platform_ioremap_resource(pdev, 1);
+ } else {
+ gpio->secure = devm_platform_ioremap_resource_byname(pdev, "security");
+ gpio->base = devm_platform_ioremap_resource_byname(pdev, "gpio");
+ }
- gpio->secure = devm_platform_ioremap_resource_byname(pdev, "security");
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);
@@ -690,11 +696,15 @@ static int tegra186_gpio_probe(struct platform_device *pdev)
gpio->gpio.names = (const char * const *)names;
- gpio->gpio.of_node = pdev->dev.of_node;
- gpio->gpio.of_gpio_n_cells = 2;
- gpio->gpio.of_xlate = tegra186_gpio_of_xlate;
- gpio->intc.name = pdev->dev.of_node->name;
+ if (!has_acpi_companion(&pdev->dev)) {
+ gpio->gpio.of_node = pdev->dev.of_node;
+ gpio->gpio.of_gpio_n_cells = 2;
+ gpio->gpio.of_xlate = tegra186_gpio_of_xlate;
+ gpio->intc.name = pdev->dev.of_node->name;
+ } else {
+ gpio->intc.name = gpio->soc->name;
+ }
gpio->intc.irq_ack = tegra186_irq_ack;
gpio->intc.irq_mask = tegra186_irq_mask;
gpio->intc.irq_unmask = tegra186_irq_unmask;
@@ -918,10 +928,21 @@ static const struct of_device_id tegra186_gpio_of_match[] = {
};
MODULE_DEVICE_TABLE(of, tegra186_gpio_of_match);
+#ifdef CONFIG_ACPI
+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);
+#endif
+
static struct platform_driver tegra186_gpio_driver = {
.driver = {
.name = "tegra186-gpio",
.of_match_table = tegra186_gpio_of_match,
+ .acpi_match_table = ACPI_PTR(tegra186_gpio_acpi_match),
},
.probe = tegra186_gpio_probe,
.remove = tegra186_gpio_remove,
--
2.7.4
next reply other threads:[~2021-06-17 10:05 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-17 10:05 Akhil R [this message]
2021-06-17 14:54 ` [PATCH] gpio: tegra186: Add ACPI support Linus Walleij
2021-06-17 15:21 ` Andy Shevchenko
2021-06-18 13:39 ` [PATCH v2] " Akhil R
2021-06-18 14:31 ` Andy Shevchenko
2021-06-21 15:08 ` Akhil R
2021-06-29 15:17 ` Akhil R
2021-06-30 16:14 ` Andy Shevchenko
2021-06-30 17:47 ` Akhil R
2021-06-30 18:17 ` [PATCH v3] " Akhil R
2021-06-30 18:23 ` Andy Shevchenko
2021-07-01 5:01 ` [PATCH v4] " Akhil R
2021-07-01 5:53 ` Jon Hunter
2021-07-01 9:00 ` [PATCH v5] " Akhil R
2021-07-08 13:08 ` Jon Hunter
2021-07-16 8:31 ` Bartosz Golaszewski
2021-07-19 4:46 ` [PATCH v6] " Akhil R
2021-08-05 19:30 ` Bartosz Golaszewski
2021-06-18 19:39 ` [PATCH] " kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1623924351-22489-1-git-send-email-akhilrajeev@nvidia.com \
--to=akhilrajeev@nvidia.com \
--cc=bgolaszewski@baylibre.com \
--cc=jonathanh@nvidia.com \
--cc=kyarlagadda@nvidia.com \
--cc=ldewangan@nvidia.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=mperttunen@nvidia.com \
--cc=smangipudi@nvidia.com \
--cc=thierry.reding@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).