linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] input: st1232 device tree support
@ 2012-03-30  8:47 Magnus Damm
  2012-03-30 10:31 ` Arnd Bergmann
  2012-03-31  6:15 ` Dmitry Torokhov
  0 siblings, 2 replies; 3+ messages in thread
From: Magnus Damm @ 2012-03-30  8:47 UTC (permalink / raw)
  To: linux-input; +Cc: arnd, linux-sh, dmitry.torokhov, rjw, lethal, Magnus Damm

From: Magnus Damm <damm@opensource.se>

This patch enables DT support for the st1232 driver
which is primarily used on the sh7372 Mackerel board.

Signed-off-by: Magnus Damm <damm@opensource.se>
---

 drivers/input/touchscreen/st1232.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- 0001/drivers/input/touchscreen/st1232.c
+++ work/drivers/input/touchscreen/st1232.c	2012-03-29 14:43:13.000000000 +0900
@@ -255,6 +255,12 @@ static const struct i2c_device_id st1232
 };
 MODULE_DEVICE_TABLE(i2c, st1232_ts_id);
 
+static const struct of_device_id st1232_ts_dt_ids[] __devinitconst = {
+	{ .compatible = "sitronix,st1232", },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, st1232_ts_dt_ids);
+
 static struct i2c_driver st1232_ts_driver = {
 	.probe		= st1232_ts_probe,
 	.remove		= __devexit_p(st1232_ts_remove),
@@ -262,6 +268,7 @@ static struct i2c_driver st1232_ts_drive
 	.driver = {
 		.name	= ST1232_TS_NAME,
 		.owner	= THIS_MODULE,
+		.of_match_table = st1232_ts_dt_ids,
 #ifdef CONFIG_PM
 		.pm	= &st1232_ts_pm_ops,
 #endif

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] input: st1232 device tree support
  2012-03-30  8:47 [PATCH] input: st1232 device tree support Magnus Damm
@ 2012-03-30 10:31 ` Arnd Bergmann
  2012-03-31  6:15 ` Dmitry Torokhov
  1 sibling, 0 replies; 3+ messages in thread
From: Arnd Bergmann @ 2012-03-30 10:31 UTC (permalink / raw)
  To: Magnus Damm; +Cc: linux-input, linux-sh, dmitry.torokhov, rjw, lethal

On Friday 30 March 2012, Magnus Damm wrote:
> From: Magnus Damm <damm@opensource.se>
> 
> This patch enables DT support for the st1232 driver
> which is primarily used on the sh7372 Mackerel board.
> 
> Signed-off-by: Magnus Damm <damm@opensource.se>

Acked-by: Arnd Bergmann <arnd@arndb.de>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] input: st1232 device tree support
  2012-03-30  8:47 [PATCH] input: st1232 device tree support Magnus Damm
  2012-03-30 10:31 ` Arnd Bergmann
@ 2012-03-31  6:15 ` Dmitry Torokhov
  1 sibling, 0 replies; 3+ messages in thread
From: Dmitry Torokhov @ 2012-03-31  6:15 UTC (permalink / raw)
  To: Magnus Damm; +Cc: linux-input, arnd, linux-sh, rjw, lethal

Hi Magnus,

On Fri, Mar 30, 2012 at 05:47:49PM +0900, Magnus Damm wrote:
> From: Magnus Damm <damm@opensource.se>
> 
> This patch enables DT support for the st1232 driver
> which is primarily used on the sh7372 Mackerel board.
> 
> Signed-off-by: Magnus Damm <damm@opensource.se>
> ---
> 
>  drivers/input/touchscreen/st1232.c |    7 +++++++
>  1 file changed, 7 insertions(+)
> 
> --- 0001/drivers/input/touchscreen/st1232.c
> +++ work/drivers/input/touchscreen/st1232.c	2012-03-29 14:43:13.000000000 +0900
> @@ -255,6 +255,12 @@ static const struct i2c_device_id st1232
>  };
>  MODULE_DEVICE_TABLE(i2c, st1232_ts_id);
>  
> +static const struct of_device_id st1232_ts_dt_ids[] __devinitconst = {
> +	{ .compatible = "sitronix,st1232", },
> +	{ }
> +};
> +MODULE_DEVICE_TABLE(of, st1232_ts_dt_ids);
> +

Should it be guarder with "#ifdef CONFIG_OF" and then we'd do

	.of_match_table = of_match_ptr(st1232_ts_dt_ids);

?

Thanks.

>  static struct i2c_driver st1232_ts_driver = {
>  	.probe		= st1232_ts_probe,
>  	.remove		= __devexit_p(st1232_ts_remove),
> @@ -262,6 +268,7 @@ static struct i2c_driver st1232_ts_drive
>  	.driver = {
>  		.name	= ST1232_TS_NAME,
>  		.owner	= THIS_MODULE,
> +		.of_match_table = st1232_ts_dt_ids,
>  #ifdef CONFIG_PM
>  		.pm	= &st1232_ts_pm_ops,
>  #endif

-- 
Dmitry

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-03-31  6:15 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-30  8:47 [PATCH] input: st1232 device tree support Magnus Damm
2012-03-30 10:31 ` Arnd Bergmann
2012-03-31  6:15 ` Dmitry Torokhov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).