From: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx> Allow the driver to probe from ACPI namespace. Signed-off-by: Aaron Lu <aaron.lu@xxxxxxxxx> Signed-off-by: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx> --- drivers/input/keyboard/gpio_keys_polled.c | 7 +++++++ 1 file changed, 7 insertions(+) Index: linux-pm/drivers/input/keyboard/gpio_keys_polled.c =================================================================== --- linux-pm.orig/drivers/input/keyboard/gpio_keys_polled.c +++ linux-pm/drivers/input/keyboard/gpio_keys_polled.c @@ -181,6 +181,12 @@ static const struct of_device_id gpio_ke }; MODULE_DEVICE_TABLE(of, gpio_keys_polled_of_match); +static const struct acpi_device_id gpio_keys_polled_acpi_match[] = { + { "PRP0001" }, /* Device Tree shoehorned into ACPI */ + { }, +}; +MODULE_DEVICE_TABLE(acpi, gpio_keys_polled_acpi_match); + static int gpio_keys_polled_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -309,6 +315,7 @@ static struct platform_driver gpio_keys_ .name = DRV_NAME, .owner = THIS_MODULE, .of_match_table = gpio_keys_polled_of_match, + .acpi_match_table = gpio_keys_polled_acpi_match, }, }; module_platform_driver(gpio_keys_polled_driver); -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html