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

Commit 33e60982 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: Add support for cm36682 in cm36283 driver"

parents c63daf39 52024f31

Documentation/devicetree/bindings/input/misc/cm36283.txt

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ Capella cm36283 L/P sensor 


Required properties:



 - compatible		: Should be "capella,cm36283".

 - compatible		: Should be "capella,cm36283" or "capella,cm36682".

 - reg				: i2c slave address of the device.

 - interrupt-parent	: Parent of interrupt.

 - interrupts		: L/P sample interrupt to indicate new data ready.

drivers/input/misc/cm36283.c

+1 −0
Original line number Diff line number Diff line
@@ -2062,6 +2062,7 @@ static const struct i2c_device_id cm36283_i2c_id[] = { 


static struct of_device_id cm36283_match_table[] = {

	{ .compatible = "capella,cm36283",},

	{ .compatible = "capella,cm36682",},

	{ },

};