|
@@ -29,7 +29,6 @@
|
|
|
#include <linux/pm_qos.h>
|
|
|
#include <linux/slab.h>
|
|
|
#include <linux/types.h>
|
|
|
-#include <linux/platform_data/st1232_pdata.h>
|
|
|
|
|
|
#define ST1232_TS_NAME "st1232-ts"
|
|
|
|
|
@@ -152,10 +151,9 @@ static void st1232_ts_power(struct st1232_ts_data *ts, bool poweron)
|
|
|
}
|
|
|
|
|
|
static int st1232_ts_probe(struct i2c_client *client,
|
|
|
- const struct i2c_device_id *id)
|
|
|
+ const struct i2c_device_id *id)
|
|
|
{
|
|
|
struct st1232_ts_data *ts;
|
|
|
- struct st1232_pdata *pdata = dev_get_platdata(&client->dev);
|
|
|
struct input_dev *input_dev;
|
|
|
int error;
|
|
|
|
|
@@ -180,13 +178,7 @@ static int st1232_ts_probe(struct i2c_client *client,
|
|
|
ts->client = client;
|
|
|
ts->input_dev = input_dev;
|
|
|
|
|
|
- if (pdata)
|
|
|
- ts->reset_gpio = pdata->reset_gpio;
|
|
|
- else if (client->dev.of_node)
|
|
|
- ts->reset_gpio = of_get_gpio(client->dev.of_node, 0);
|
|
|
- else
|
|
|
- ts->reset_gpio = -ENODEV;
|
|
|
-
|
|
|
+ ts->reset_gpio = of_get_gpio(client->dev.of_node, 0);
|
|
|
if (gpio_is_valid(ts->reset_gpio)) {
|
|
|
error = devm_gpio_request(&client->dev, ts->reset_gpio, NULL);
|
|
|
if (error) {
|
|
@@ -281,13 +273,11 @@ 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[] = {
|
|
|
{ .compatible = "sitronix,st1232", },
|
|
|
{ }
|
|
|
};
|
|
|
MODULE_DEVICE_TABLE(of, st1232_ts_dt_ids);
|
|
|
-#endif
|
|
|
|
|
|
static struct i2c_driver st1232_ts_driver = {
|
|
|
.probe = st1232_ts_probe,
|
|
@@ -295,7 +285,7 @@ static struct i2c_driver st1232_ts_driver = {
|
|
|
.id_table = st1232_ts_id,
|
|
|
.driver = {
|
|
|
.name = ST1232_TS_NAME,
|
|
|
- .of_match_table = of_match_ptr(st1232_ts_dt_ids),
|
|
|
+ .of_match_table = st1232_ts_dt_ids,
|
|
|
.pm = &st1232_ts_pm_ops,
|
|
|
},
|
|
|
};
|