From patchwork Fri Aug 22 23:03:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sjoerd Simons X-Patchwork-Id: 4767471 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 761D69F7CB for ; Fri, 22 Aug 2014 23:03:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AC39020131 for ; Fri, 22 Aug 2014 23:03:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C004020172 for ; Fri, 22 Aug 2014 23:03:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752158AbaHVXDR (ORCPT ); Fri, 22 Aug 2014 19:03:17 -0400 Received: from cube.luon.net ([37.72.100.20]:45504 "EHLO cube.luon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752232AbaHVXDO (ORCPT ); Fri, 22 Aug 2014 19:03:14 -0400 Received: from localhost (localhost [127.0.0.1]) by cube.luon.net (Postfix) with ESMTP id BDE63E2C70; Sat, 23 Aug 2014 01:03:12 +0200 (CEST) Received: from cube.luon.net ([127.0.0.1]) by localhost (cube.luon.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UpQ9X0M82bs5; Sat, 23 Aug 2014 01:03:12 +0200 (CEST) Received: from dusk.luon.net (g111211.upc-g.chello.nl [80.57.111.211]) by cube.luon.net (Postfix) with ESMTPSA id 720E6E2C6A; Sat, 23 Aug 2014 01:03:12 +0200 (CEST) Received: by dusk.luon.net (Postfix, from userid 1000) id 271D2216D6; Sat, 23 Aug 2014 01:03:12 +0200 (CEST) From: Sjoerd Simons To: Doug Anderson , Lee Jones Cc: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, Sjoerd Simons Subject: [PATCH 2/2] input: cros_ec_keyb: Add of match table Date: Sat, 23 Aug 2014 01:03:02 +0200 Message-Id: <1408748582-29029-3-git-send-email-sjoerd.simons@collabora.co.uk> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1408748582-29029-1-git-send-email-sjoerd.simons@collabora.co.uk> References: <1408748582-29029-1-git-send-email-sjoerd.simons@collabora.co.uk> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP To enable the cros_ec_keyb driver to be auto-loaded when build as module add an of match table (and export it) to match the modalias information passed on to userspace as the Cros EC MFD driver registers the MFD subdevices with an of_compatibility string. Signed-off-by: Sjoerd Simons Reviewed-by: Javier Martinez Canillas --- drivers/input/keyboard/cros_ec_keyb.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c index 791781a..0bdbf2d 100644 --- a/drivers/input/keyboard/cros_ec_keyb.c +++ b/drivers/input/keyboard/cros_ec_keyb.c @@ -342,10 +342,20 @@ static int cros_ec_keyb_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(cros_ec_keyb_pm_ops, NULL, cros_ec_keyb_resume); +#ifdef CONFIG_OF +static const struct of_device_id cros_ec_keyb_of_match[] = { + { .compatible = "google,cros-ec-keyb" }, + {}, +}; +MODULE_DEVICE_TABLE(of, cros_ec_keyb_of_match); +#endif + + static struct platform_driver cros_ec_keyb_driver = { .probe = cros_ec_keyb_probe, .driver = { .name = "cros-ec-keyb", + .of_match_table = of_match_ptr (cros_ec_keyb_of_match), .pm = &cros_ec_keyb_pm_ops, }, };