OSDN Git Service

Input: stmpe-ts - fix automatic module loading
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 22 May 2015 20:09:11 +0000 (13:09 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 22 May 2015 22:30:11 +0000 (15:30 -0700)
When STMPE is instantiated via device tree individual MFD cells rae formed
with OF modaliases, not platform modaliases, and so we need to add OF
device table to the driver if we want it to load automatically:

of:Nstmpe_touchscreenT<NULL>Cst,stmpe-ts

Reported-by: Heiner Kallweit <hkallweit1@gmail.com>
Tested-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/touchscreen/stmpe-ts.c

index e4c3125..e4977c6 100644 (file)
@@ -383,13 +383,21 @@ static int stmpe_ts_remove(struct platform_device *pdev)
 
 static struct platform_driver stmpe_ts_driver = {
        .driver = {
-                  .name = STMPE_TS_NAME,
-                  },
+               .name = STMPE_TS_NAME,
+       },
        .probe = stmpe_input_probe,
        .remove = stmpe_ts_remove,
 };
 module_platform_driver(stmpe_ts_driver);
 
+#ifdef CONFIG_OF
+static const struct of_device_id stmpe_ts_ids[] = {
+       { .compatible = "st,stmpe-ts", },
+       { },
+};
+MODULE_DEVICE_TABLE(of, stmpe_ts_ids);
+#endif
+
 MODULE_AUTHOR("Luotao Fu <l.fu@pengutronix.de>");
 MODULE_DESCRIPTION("STMPEXXX touchscreen driver");
 MODULE_LICENSE("GPL");