From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Westerberg Subject: [RFC PATCH v2 14/16] input: gpio_keys_polled - Add ACPI probing support Date: Tue, 16 Sep 2014 14:52:45 +0300 Message-ID: <1410868367-11056-15-git-send-email-mika.westerberg@linux.intel.com> References: <1410868367-11056-1-git-send-email-mika.westerberg@linux.intel.com> Return-path: In-Reply-To: <1410868367-11056-1-git-send-email-mika.westerberg@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org To: "Rafael J. Wysocki" Cc: linux-acpi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Linus Walleij , Alexandre Courbot , Dmitry Torokhov , Bryan Wu , Lee Jones , Grant Likely , Arnd Bergmann , Aaron Lu , Darren Hart , Mika Westerberg List-Id: devicetree@vger.kernel.org Allow the driver to probe from ACPI namespace. Signed-off-by: Aaron Lu Signed-off-by: Mika Westerberg --- drivers/input/keyboard/gpio_keys_polled.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c index 9afd9a6c43f4..89bf5732d200 100644 --- a/drivers/input/keyboard/gpio_keys_polled.c +++ b/drivers/input/keyboard/gpio_keys_polled.c @@ -189,6 +189,12 @@ static const struct of_device_id gpio_keys_polled_of_match[] = { }; 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; @@ -317,6 +323,7 @@ static struct platform_driver gpio_keys_polled_driver = { .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); -- 2.1.0