diff options
| author | Xiaohui Tao <xtao@nvidia.com> | 2014-05-15 10:50:37 -0700 |
|---|---|---|
| committer | Mandar Padmawar <mpadmawar@nvidia.com> | 2014-05-19 07:46:13 -0700 |
| commit | 0939a054ec5d80dfc9dd1f1f504fb470620bc9ce (patch) | |
| tree | 1fa36dc8d810f175158dc03ab0f70fbdb278b007 /drivers/input | |
| parent | 9c0e1772b612dcdc58bf6598ce8f67ec1d7c9416 (diff) | |
input: touch: raydium: code drop V73.8
Add T132 touch support for TN8
Bug 200004659
Change-Id: Id6c36db22e9376dd0ce8055c3aeaa25e56c9c0fe
Signed-off-by: Xiaohui Tao <xtao@nvidia.com>
Reviewed-on: http://git-master/r/410383
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/touchscreen/rm31080a_ts.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/input/touchscreen/rm31080a_ts.c b/drivers/input/touchscreen/rm31080a_ts.c index 3be70a391b9b..b2d4e667a98c 100644 --- a/drivers/input/touchscreen/rm31080a_ts.c +++ b/drivers/input/touchscreen/rm31080a_ts.c @@ -733,9 +733,8 @@ void rm_tch_ctrl_set_baseline(u8 *arg, u16 u16Len) static int rm_tch_write_image_data(void) { int ret = RETURN_OK; - struct rm_tch_ts *ts = input_get_drvdata(g_input_dev); - ret = rm_tch_cmd_process(0, g_st_rm_writeimg_cmd, ts); + ret = rm_tch_cmd_process(0, g_st_rm_writeimg_cmd, NULL); return ret; } @@ -2875,19 +2874,19 @@ static struct rm_spi_ts_platform_data *rm_ts_parse_dt(struct device *dev, if (ret < 0) goto exit_release_all_gpio; pdata->config = (unsigned char *)val; + ret = of_property_read_u32(np, "platform-id", &val); if (ret < 0) goto exit_release_all_gpio; pdata->platform_id = val; + ret = of_property_read_string(np, "name-of-clock", &str); - if (ret < 0) - goto exit_release_all_gpio; - pdata->name_of_clock = (char *)str; + if (ret == 0) + pdata->name_of_clock = (char *)str; ret = of_property_read_string(np, "name-of-clock-con", &str); - if (ret < 0) - goto exit_release_all_gpio; - pdata->name_of_clock_con = (char *)str; + if (ret == 0) + pdata->name_of_clock_con = (char *)str; return pdata; |