Merge tag 'v4.8' into next
Sync up with mainline to bring in I2C host notify changes and other updates.
This commit is contained in:
@@ -29,7 +29,7 @@ Optional properties:
|
||||
ti,vref-delay-usecs vref supply delay in usecs, 0 for
|
||||
external vref (u16).
|
||||
ti,vref-mv The VREF voltage, in millivolts (u16).
|
||||
Set to 0 to use internal refernce
|
||||
Set to 0 to use internal references
|
||||
(ADS7846).
|
||||
ti,keep-vref-on set to keep vref on for differential
|
||||
measurements as well
|
||||
|
@@ -1,7 +1,7 @@
|
||||
* Cirrus Logic CLPS711X matrix keypad device tree bindings
|
||||
|
||||
Required Properties:
|
||||
- compatible: Shall contain "cirrus,clps711x-keypad".
|
||||
- compatible: Shall contain "cirrus,ep7209-keypad".
|
||||
- row-gpios: List of GPIOs used as row lines.
|
||||
- poll-interval: Poll interval time in milliseconds.
|
||||
- linux,keymap: The definition can be found at
|
||||
@@ -12,7 +12,7 @@ Optional Properties:
|
||||
|
||||
Example:
|
||||
keypad {
|
||||
compatible = "cirrus,ep7312-keypad", "cirrus,clps711x-keypad";
|
||||
compatible = "cirrus,ep7312-keypad", "cirrus,ep7209-keypad";
|
||||
autorepeat;
|
||||
poll-interval = <120>;
|
||||
row-gpios = <&porta 0 0>,
|
||||
|
@@ -15,7 +15,7 @@ Optional properties:
|
||||
- fsl,pen-debounce-ns: Pen debounce time in nanoseconds.
|
||||
- fsl,pen-threshold: Pen-down threshold for the touchscreen. This is a value
|
||||
between 1 and 4096. It is the ratio between the internal reference voltage
|
||||
and the measured voltage after the plate was precharged. Resistence between
|
||||
and the measured voltage after the plate was precharged. Resistance between
|
||||
plates and therefore the voltage decreases with pressure so that a smaller
|
||||
value is equivalent to a higher pressure.
|
||||
- fsl,settling-time-ns: Settling time in nanoseconds. The settling time is before
|
||||
|
@@ -13,6 +13,7 @@ Required properties:
|
||||
- touchscreen-size-y : See touchscreen.txt
|
||||
|
||||
Optional properties:
|
||||
- firmware-name : File basename (string) for board specific firmware
|
||||
- touchscreen-inverted-x : See touchscreen.txt
|
||||
- touchscreen-inverted-y : See touchscreen.txt
|
||||
- touchscreen-swapped-x-y : See touchscreen.txt
|
||||
|
Reference in New Issue
Block a user