Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a1d88ab authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "input: touchscreen: nt36xxx: Disable WAKEUP_GESTURE"

parents 6e8eff88 32e4ca89

drivers/input/touchscreen/nt36xxx/nt36xxx.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -1486,7 +1486,9 @@ nvt_flash_proc_deinit(); 
	}

	}

err_input_dev_alloc_failed:

err_input_dev_alloc_failed:

err_chipvertrim_failed:

err_chipvertrim_failed:

	nvt_gpio_deconfig(ts);

err_gpio_config_failed:

err_gpio_config_failed:

	NVT_ERR("ret = %d\n", ret);

	return ret;

	return ret;

}

}
@@ -1626,6 +1628,7 @@ static int32_t nvt_ts_remove(struct i2c_client *client) 
#endif

#endif





#if WAKEUP_GESTURE

#if WAKEUP_GESTURE

	if (ts->input_dev)

		device_init_wakeup(&ts->input_dev->dev, 0);

		device_init_wakeup(&ts->input_dev->dev, 0);

#endif

#endif
@@ -1696,6 +1699,7 @@ static void nvt_ts_shutdown(struct i2c_client *client) 
#endif

#endif





#if WAKEUP_GESTURE

#if WAKEUP_GESTURE

	if (ts->input_dev)

		device_init_wakeup(&ts->input_dev->dev, 0);

		device_init_wakeup(&ts->input_dev->dev, 0);

#endif

#endif

}

}

drivers/input/touchscreen/nt36xxx/nt36xxx.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -78,7 +78,7 @@ extern const uint16_t touch_key_array[TOUCH_KEY_NUM]; 
#define NVT_TOUCH_EXT_PROC 1

#define NVT_TOUCH_EXT_PROC 1

#define NVT_TOUCH_MP 1

#define NVT_TOUCH_MP 1

#define MT_PROTOCOL_B 1

#define MT_PROTOCOL_B 1

#define WAKEUP_GESTURE 1

#define WAKEUP_GESTURE 0

#if WAKEUP_GESTURE

#if WAKEUP_GESTURE

extern const uint16_t gesture_key_array[];

extern const uint16_t gesture_key_array[];

#endif

#endif