A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 05:39:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

goodix_gtx8_v1430_mmi: Use i2c device to register ts_mmi

Browse source 
TP:
touchscreen_mmi need read device device-tree node.
So must use bus device to register ts_mmi.

Change-Id: I26edf7bb276e8d052bf228d11b2e57abcdb5e359
Signed-off-by: haojl2 <haojl2@motorola.com>
Reviewed-on: https://gerrit.mot.com/1473718
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Jianqi Yang <yangj@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
haojl2 2019-12-18 12:50:29 +08:00 • committed by Jialei Hao
commit 91b889d6a3
2 changed files with 125 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/input/touchscreen/goodix_gtx8_v1430_mmi/goodix_ts_i2c.c
View file

@ -1866,6 +1866,8 @@ static int goodix_i2c_probe(struct i2c_client *client,
if (!goodix_pdev)
return -ENOMEM;
i2c_set_clientdata(client, goodix_pdev);
goodix_pdev->name = GOODIX_CORE_DRIVER_NAME;
goodix_pdev->id = 0;
goodix_pdev->num_resources = 0;
@ -1898,6 +1900,7 @@ err_pdriver:
err_pdev:
kfree(goodix_pdev);
goodix_pdev = NULL;
i2c_set_clientdata(client, NULL);
ts_info("i2c probe out, %d", r);
return r;
}

139
drivers/input/touchscreen/goodix_gtx8_v1430_mmi/goodix_ts_mmi.c
View file

@ -33,7 +33,14 @@ static int goodix_ts_mmi_methods_get_build_id(struct device *dev, void *cdata) {
int ret;
struct goodix_ts_version fw_ver;
struct goodix_ts_device *ts_dev;
struct goodix_ts_core *core_data = dev_get_drvdata(dev);
struct goodix_ts_core *core_data;
struct platform_device *pdev = dev_get_drvdata(dev);
if (!pdev) {
ts_err("Failed to get platform device");
return -ENODEV;
}
core_data = platform_get_drvdata(pdev);
if (!core_data) {
ts_err("Failed to get driver data");
return -ENODEV;
@ -56,7 +63,14 @@ static int goodix_ts_mmi_methods_get_config_id(struct device *dev, void *cdata)
int ret;
struct goodix_ts_version fw_ver;
struct goodix_ts_device *ts_dev;
struct goodix_ts_core *core_data = dev_get_drvdata(dev);
struct goodix_ts_core *core_data;
struct platform_device *pdev = dev_get_drvdata(dev);
if (!pdev) {
ts_err("Failed to get platform device");
return -ENODEV;
}
core_data = platform_get_drvdata(pdev);
if (!core_data) {
ts_err("Failed to get driver data");
return -ENODEV;
@ -80,7 +94,14 @@ static int goodix_ts_mmi_methods_get_bus_type(struct device *dev, void *idata) {
}
static int goodix_ts_mmi_methods_get_irq_status(struct device *dev, void *idata) {
struct goodix_ts_board_data *ts_bdata;
struct goodix_ts_core *core_data = dev_get_drvdata(dev);
struct goodix_ts_core *core_data;
struct platform_device *pdev = dev_get_drvdata(dev);
if (!pdev) {
ts_err("Failed to get platform device");
return -ENODEV;
}
core_data = platform_get_drvdata(pdev);
if (!core_data) {
ts_err("Failed to get driver data");
return -ENODEV;
@ -94,7 +115,14 @@ static int goodix_ts_mmi_methods_get_irq_status(struct device *dev, void *idata)
return 0;
}
static int goodix_ts_mmi_methods_get_drv_irq(struct device *dev, void *idata) {
struct goodix_ts_core *core_data = dev_get_drvdata(dev);
struct goodix_ts_core *core_data;
struct platform_device *pdev = dev_get_drvdata(dev);
if (!pdev) {
ts_err("Failed to get platform device");
return -ENODEV;
}
core_data = platform_get_drvdata(pdev);
if (!core_data) {
ts_err("Failed to get driver data");
return -ENODEV;
@ -103,7 +131,14 @@ static int goodix_ts_mmi_methods_get_drv_irq(struct device *dev, void *idata) {
return 0;
}
static int goodix_ts_mmi_methods_get_poweron(struct device *dev, void *idata) {
struct goodix_ts_core *core_data = dev_get_drvdata(dev);
struct goodix_ts_core *core_data;
struct platform_device *pdev = dev_get_drvdata(dev);
if (!pdev) {
ts_err("Failed to get platform device");
return -ENODEV;
}
core_data = platform_get_drvdata(pdev);
if (!core_data) {
ts_err("Failed to get driver data");
return -ENODEV;
@ -112,7 +147,14 @@ static int goodix_ts_mmi_methods_get_poweron(struct device *dev, void *idata) {
return 0;
}
static int goodix_ts_mmi_methods_get_flashprog(struct device *dev, void *idata) {
struct goodix_ts_core *core_data = dev_get_drvdata(dev);
struct goodix_ts_core *core_data;
struct platform_device *pdev = dev_get_drvdata(dev);
if (!pdev) {
ts_err("Failed to get platform device");
return -ENODEV;
}
core_data = platform_get_drvdata(pdev);
if (!core_data) {
ts_err("Failed to get driver data");
return -ENODEV;
@ -124,7 +166,14 @@ static int goodix_ts_mmi_methods_get_flashprog(struct device *dev, void *idata)
return 0;
}
static int goodix_ts_mmi_methods_drv_irq(struct device *dev, int state) {
struct goodix_ts_core *core_data = dev_get_drvdata(dev);
struct goodix_ts_core *core_data;
struct platform_device *pdev = dev_get_drvdata(dev);
if (!pdev) {
ts_err("Failed to get platform device");
return -ENODEV;
}
core_data = platform_get_drvdata(pdev);
if (!core_data) {
ts_err("Failed to get driver data");
return -ENODEV;
@ -140,7 +189,14 @@ static int goodix_ts_mmi_methods_drv_irq(struct device *dev, int state) {
static int goodix_ts_mmi_methods_reset(struct device *dev, int type) {
int ret = -ENODEV;
struct goodix_ts_device *ts_dev;
struct goodix_ts_core *core_data = dev_get_drvdata(dev);
struct goodix_ts_core *core_data;
struct platform_device *pdev = dev_get_drvdata(dev);
if (!pdev) {
ts_err("Failed to get platform device");
return -ENODEV;
}
core_data = platform_get_drvdata(pdev);
if (!core_data) {
ts_err("Failed to get driver data");
return -ENODEV;
@ -152,7 +208,14 @@ static int goodix_ts_mmi_methods_reset(struct device *dev, int type) {
}
static int goodix_ts_firmware_update(struct device *dev, char *fwname) {
struct goodix_ts_board_data *ts_bdata;
struct goodix_ts_core *core_data = dev_get_drvdata(dev);
struct goodix_ts_core *core_data;
struct platform_device *pdev = dev_get_drvdata(dev);
if (!pdev) {
ts_err("Failed to get platform device");
return -ENODEV;
}
core_data = platform_get_drvdata(pdev);
if (!core_data) {
ts_err("Failed to get driver data");
return -ENODEV;
@ -183,8 +246,14 @@ static int goodix_ts_firmware_update(struct device *dev, char *fwname) {
}
static int goodix_ts_mmi_methods_power(struct device *dev, int on) {
struct goodix_ts_core *core_data = dev_get_drvdata(dev);
struct goodix_ts_core *core_data;
struct platform_device *pdev = dev_get_drvdata(dev);
if (!pdev) {
ts_err("Failed to get platform device");
return -ENODEV;
}
core_data = platform_get_drvdata(pdev);
if (!core_data) {
ts_err("Failed to get driver data");
return -ENODEV;
@ -202,8 +271,14 @@ static int goodix_ts_mmi_methods_power(struct device *dev, int on) {
#ifdef CONFIG_PINCTRL
static int goodix_ts_mmi_methods_pinctrl(struct device *dev, int on) {
struct goodix_ts_core *core_data = dev_get_drvdata(dev);
struct goodix_ts_core *core_data;
struct platform_device *pdev = dev_get_drvdata(dev);
if (!pdev) {
ts_err("Failed to get platform device");
return -ENODEV;
}
core_data = platform_get_drvdata(pdev);
if (!core_data) {
ts_err("Failed to get driver data");
return -ENODEV;
@ -229,9 +304,15 @@ static int goodix_ts_mmi_methods_pinctrl(struct device *dev, int on) {
static int goodix_ts_mmi_panel_state(struct device *dev,
enum ts_mmi_pm_mode from, enum ts_mmi_pm_mode to)
{
struct goodix_ts_core *core_data = dev_get_drvdata(dev);
struct goodix_ts_device *ts_dev;
struct goodix_ts_core *core_data;
struct platform_device *pdev = dev_get_drvdata(dev);
if (!pdev) {
ts_err("Failed to get platform device");
return -ENODEV;
}
core_data = platform_get_drvdata(pdev);
if (!core_data) {
ts_err("Failed to get driver data");
return -ENODEV;
@ -261,13 +342,19 @@ static int goodix_ts_mmi_panel_state(struct device *dev,
}
static int goodix_ts_mmi_pre_resume(struct device *dev) {
struct goodix_ts_core *core_data = dev_get_drvdata(dev);
struct goodix_ext_module *ext_module, *next;
struct input_dev *input_dev;
struct input_mt *mt;
int i;
int r = 0;
struct goodix_ts_core *core_data;
struct platform_device *pdev = dev_get_drvdata(dev);
if (!pdev) {
ts_err("Failed to get platform device");
return -ENODEV;
}
core_data = platform_get_drvdata(pdev);
if (!core_data) {
ts_err("Failed to get driver data");
return -ENODEV;
@ -312,10 +399,16 @@ out:
}
static int goodix_ts_mmi_post_resume(struct device *dev) {
struct goodix_ts_core *core_data = dev_get_drvdata(dev);
struct goodix_ext_module *ext_module, *next;
int r = 0;
struct goodix_ts_core *core_data;
struct platform_device *pdev = dev_get_drvdata(dev);
if (!pdev) {
ts_err("Failed to get platform device");
return -ENODEV;
}
core_data = platform_get_drvdata(pdev);
if (!core_data) {
ts_err("Failed to get driver data");
return -ENODEV;
@ -352,10 +445,16 @@ out:
}
static int goodix_ts_mmi_pre_suspend(struct device *dev) {
struct goodix_ts_core *core_data = dev_get_drvdata(dev);
struct goodix_ext_module *ext_module, *next;
int r = 0;
struct goodix_ts_core *core_data;
struct platform_device *pdev = dev_get_drvdata(dev);
if (!pdev) {
ts_err("Failed to get platform device");
return -ENODEV;
}
core_data = platform_get_drvdata(pdev);
if (!core_data) {
ts_err("Failed to get driver data");
return -ENODEV;
@ -392,10 +491,16 @@ out:
}
static int goodix_ts_mmi_post_suspend(struct device *dev) {
struct goodix_ts_core *core_data = dev_get_drvdata(dev);
struct goodix_ext_module *ext_module, *next;
int r = 0;
struct goodix_ts_core *core_data;
struct platform_device *pdev = dev_get_drvdata(dev);
if (!pdev) {
ts_err("Failed to get platform device");
return -ENODEV;
}
core_data = platform_get_drvdata(pdev);
if (!core_data) {
ts_err("Failed to get driver data");
return -ENODEV;
@ -487,7 +592,7 @@ int goodix_ts_mmi_dev_register(struct platform_device *pdev) {
}
core_data->ts_mmi_info.mmi_notifier.notifier_call = mmi_notifier_callback;
goodix_ts_register_notifier(&core_data->ts_mmi_info.mmi_notifier);
ret = ts_mmi_dev_register(&pdev->dev, &goodix_ts_mmi_methods);
ret = ts_mmi_dev_register(core_data->ts_dev->dev, &goodix_ts_mmi_methods);
if (ret) {
dev_err(&pdev->dev, "Failed to register ts mmi\n");
return ret;