OSDN Git Service

Input: st1232 - add device tree support
authorMagnus Damm <damm@opensource.se>
Tue, 3 Apr 2012 18:30:28 +0000 (11:30 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 4 Apr 2012 16:25:40 +0000 (09:25 -0700)
This patch enables DT support for the st1232 driver
which is primarily used on the sh7372 Mackerel board.

[dtor@mail.ru: chnaged to use CONFIG_OF and of_match_ptr]
Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
drivers/input/touchscreen/st1232.c

index cbbf71b..216fabb 100644 (file)
@@ -255,6 +255,14 @@ static const struct i2c_device_id st1232_ts_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, st1232_ts_id);
 
+#ifdef CONFIG_OF
+static const struct of_device_id st1232_ts_dt_ids[] __devinitconst = {
+       { .compatible = "sitronix,st1232", },
+       { }
+};
+MODULE_DEVICE_TABLE(of, st1232_ts_dt_ids);
+#endif
+
 static struct i2c_driver st1232_ts_driver = {
        .probe          = st1232_ts_probe,
        .remove         = __devexit_p(st1232_ts_remove),
@@ -262,6 +270,7 @@ static struct i2c_driver st1232_ts_driver = {
        .driver = {
                .name   = ST1232_TS_NAME,
                .owner  = THIS_MODULE,
+               .of_match_table = of_match_ptr(st1232_ts_dt_ids),
 #ifdef CONFIG_PM
                .pm     = &st1232_ts_pm_ops,
 #endif