mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-28 07:04:00 +08:00
gpio: tegra186: Add ACPI support
Add ACPI module ID to probe the driver from the ACPI based bootloader firmware. Signed-off-by: Akhil R <akhilrajeev@nvidia.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Reviewed-by: Jon Hunter <jonathanh@nvidia.com> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
This commit is contained in:
parent
8990899d84
commit
2606e7c9f5
@ -610,15 +610,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)
|
||||
@ -680,11 +686,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;
|
||||
@ -896,10 +904,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,
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user