diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-10-14 03:23:40 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-10-14 03:23:40 +0300 |
| commit | 1134ca268e7387773cd6cf57aa82cc9d5e0f9127 (patch) | |
| tree | d1dec9989de703de689c240dd2cd157fe72f49a9 /Documentation/devicetree | |
| parent | c758f96a8c346ac5a6822b521ec92308c5774381 (diff) | |
| parent | 930e19248e9b61da36c967687ca79c4d5f977919 (diff) | |
| download | linux-1134ca268e7387773cd6cf57aa82cc9d5e0f9127.tar.xz | |
Merge branch 'next' into for-linus
Prepare second round of input updates for 4.9 merge window.
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/input/touchscreen/melfas_mip4.txt | 21 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 1 |
2 files changed, 22 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/input/touchscreen/melfas_mip4.txt b/Documentation/devicetree/bindings/input/touchscreen/melfas_mip4.txt new file mode 100644 index 000000000000..7b8944c2cb31 --- /dev/null +++ b/Documentation/devicetree/bindings/input/touchscreen/melfas_mip4.txt @@ -0,0 +1,21 @@ +* MELFAS MIP4 Touchscreen + +Required properties: +- compatible: must be "melfas,mip4_ts" +- reg: I2C slave address of the chip (0x48 or 0x34) +- interrupt-parent: interrupt controller to which the chip is connected +- interrupts: interrupt to which the chip is connected + +Optional properties: +- ce-gpios: GPIO connected to the CE (chip enable) pin of the chip + +Example: + i2c@00000000 { + touchscreen: melfas_mip4@48 { + compatible = "melfas,mip4_ts"; + reg = <0x48>; + interrupt-parent = <&gpio>; + interrupts = <0 IRQ_TYPE_EDGE_FALLING>; + ce-gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; + }; + }; diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 99029cfed459..1457fd4d035f 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -143,6 +143,7 @@ marvell Marvell Technology Group Ltd. maxim Maxim Integrated Products mediatek MediaTek Inc. melexis Melexis N.V. +melfas MELFAS Inc. merrii Merrii Technology Co., Ltd. micrel Micrel Inc. microchip Microchip Technology Inc. |