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-12 15:49:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

touch: nt36xxx: fix build error due to wakeup API changes

Browse source 
On latest 4.19 kernel update, wakeup_source_init API was removed.
So, replacing it as follows:

- wakeup_source_init => wakeup_source_register

Also, ensure wake_source_register is compatible with all kernels.

NO_PROP_NEEDED: <only applies to bo>

Change-Id: I8f3b7a62c0b17456aba18400e00117507f9e1873
Reviewed-on: https://gerrit.mot.com/1699261
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Ling Jin <lingjin@motorola.com>
Submit-Approved: Sergio Vilela <sv008@motorola.com>
This commit is contained in:
Gilberto Gambugge 2020-07-21 16:44:36 -03:00 • committed by Gilberto Gambugge Neto
commit 048b4ec727
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.c
View file

@ -25,6 +25,7 @@
#include <linux/of_gpio.h>
#include <linux/of_irq.h>
#include <linux/power_supply.h>
#include <linux/version.h>
#if defined(CONFIG_FB)
#ifdef CONFIG_DRM_MSM
@ -57,7 +58,7 @@ enum touch_state {
#ifdef CONFIG_HAS_WAKELOCK
static struct wake_lock gesture_wakelock;
#else
static struct wakeup_source gesture_wakelock;
static struct wakeup_source *gesture_wakelock;
#endif
static struct sensors_classdev __maybe_unused sensors_touch_cdev = {
@ -1054,7 +1055,7 @@ void nvt_ts_wakeup_gesture_report(uint8_t gesture_id, uint8_t *data)
#ifdef CONFIG_HAS_WAKELOCK
wake_lock_timeout(&gesture_wakelock, msecs_to_jiffies(5000));
#else
__pm_wakeup_event(&gesture_wakelock, 5000);
__pm_wakeup_event(gesture_wakelock, 5000);
#endif
#else
input_report_key(ts->input_dev, keycode, 1);
@ -2010,7 +2011,15 @@ static int32_t nvt_ts_probe(struct spi_device *client)
#ifdef CONFIG_HAS_WAKELOCK
wake_lock_init(&gesture_wakelock, WAKE_LOCK_SUSPEND, "dt-wake-lock");
#else
wakeup_source_init(&gesture_wakelock, "dt-wake-lock");
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 110))
gesture_wakelock = wakeup_source_register(&client->dev, "dt-wake-lock");
#else
gesture_wakelock = wakeup_source_register("dt-wake-lock");
#endif
if (!gesture_wakelock) {
NVT_ERR("failed to allocate wakeup source\n");
goto err_wakeup_source_register_failed;
}
#endif
if (!nvt_sensor_init(ts))
initialized_sensor = true;
@ -2226,6 +2235,9 @@ err_register_charger_notify_failed:
err_charger_detection_alloc_failed:
err_charger_notify_wq_failed:
free_irq(client->irq, ts);
#ifndef CONFIG_HAS_WAKELOCK
err_wakeup_source_register_failed:
#endif
err_int_request_failed:
input_unregister_device(ts->input_dev);
ts->input_dev = NULL;