From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751870AbaJACHi (ORCPT ); Tue, 30 Sep 2014 22:07:38 -0400 Received: from v094114.home.net.pl ([79.96.170.134]:56497 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1750996AbaJACDN (ORCPT ); Tue, 30 Sep 2014 22:03:13 -0400 From: "Rafael J. Wysocki" To: linux-kernel@vger.kernel.org Cc: Mika Westerberg , linux-acpi@vger.kernel.org, devicetree@vger.kernel.org, Greg Kroah-Hartman , Linus Walleij , Alexandre Courbot , Dmitry Torokhov , Bryan Wu , Lee Jones , Grant Likely , Arnd Bergmann , Aaron Lu , Darren Hart Subject: [PATCH v3 13/15] input: gpio_keys_polled - Add ACPI probing support Date: Wed, 01 Oct 2014 04:20:43 +0200 Message-ID: <17237242.r7oKCjnQJM@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/3.16.0-rc5+; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1852462.V1jlbi8OPt@vostro.rjw.lan> References: <1410868367-11056-1-git-send-email-mika.westerberg@linux.intel.com> <1852462.V1jlbi8OPt@vostro.rjw.lan> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mika Westerberg Allow the driver to probe from ACPI namespace. Signed-off-by: Aaron Lu Signed-off-by: Mika Westerberg Signed-off-by: Rafael J. Wysocki --- 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);