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

Commit 60f39e54 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "input: sensors: correct ALPS sensor reporting mode flags"

parents a2f8efdc 40e3c7fe

drivers/input/misc/ap3426.c

+2 −1
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ static struct sensors_classdev als_cdev = { 
	.min_delay = 100000,

	.fifo_reserved_event_count = 0,

	.fifo_max_event_count = 0,

	.flags = 2,

	.enabled = 0,

	.delay_msec = 50,

	.sensors_enable = NULL,
@@ -217,7 +218,7 @@ static struct sensors_classdev ps_cdev = { 
	.min_delay = 5000,

	.fifo_reserved_event_count = 0,

	.fifo_max_event_count = 0,

	.flags = 1,

	.flags = 3,

	.enabled = 0,

	.delay_msec = 50,

	.sensors_enable = NULL,

drivers/input/misc/ltr553.c

+2 −1
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ static struct sensors_classdev als_cdev = { 
	.min_delay = 50000,

	.fifo_reserved_event_count = 0,

	.fifo_max_event_count = 0,

	.flags = 2,

	.enabled = 0,

	.delay_msec = 50,

	.sensors_enable = NULL,
@@ -269,7 +270,7 @@ static struct sensors_classdev ps_cdev = { 
	.min_delay = 10000,

	.fifo_reserved_event_count = 0,

	.fifo_max_event_count = 0,

	.flags = 1,

	.flags = 3,

	.enabled = 0,

	.delay_msec = 50,

	.sensors_enable = NULL,

drivers/misc/apds993x.c

+2 −1
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ static struct sensors_classdev sensors_light_cdev = { 
	.min_delay = 30000, /* in microseconds */

	.fifo_reserved_event_count = 0,

	.fifo_max_event_count = 0,

	.flags = 2,

	.enabled = 0,

	.delay_msec = 100,

	.sensors_enable = NULL,
@@ -316,7 +317,7 @@ static struct sensors_classdev sensors_proximity_cdev = { 
	.min_delay = 30000, /* in microseconds */

	.fifo_reserved_event_count = 0,

	.fifo_max_event_count = 0,

	.flags = 1,

	.flags = 3,

	.enabled = 0,

	.delay_msec = 100,

	.sensors_enable = NULL,