]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
Input: cros_ec_keyb - add of match table
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>
Wed, 8 Oct 2014 18:38:21 +0000 (11:38 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 9 Oct 2014 22:27:25 +0000 (15:27 -0700)
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 <sjoerd.simons@collabora.co.uk>
Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/keyboard/cros_ec_keyb.c

index 72d3499bb0290c7a0d68c9be116752569a50ad78..1e83ef99098e453afdf56f69dfae693f2c59d9d5 100644 (file)
@@ -348,10 +348,19 @@ 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,
        },
 };