diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-12-28 17:10:54 -0800 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-12-28 17:10:54 -0800 |
commit | 592b15ba7260f8dec8bfc71ef0ea1934801a35aa (patch) | |
tree | 51ead1b83e10da0cf6623116f37a15bc142f9d8b /Documentation/devicetree/bindings | |
parent | 7db54c89f0b30a101584e09d3729144e6170059d (diff) | |
parent | 1e3c336ad8f40f88a8961c434640920fe35cc08b (diff) | |
download | linux-stable-592b15ba7260f8dec8bfc71ef0ea1934801a35aa.tar.gz linux-stable-592b15ba7260f8dec8bfc71ef0ea1934801a35aa.tar.bz2 linux-stable-592b15ba7260f8dec8bfc71ef0ea1934801a35aa.zip |
Merge branch 'next' into for-linus
Prepare input updates for 4.21 merge window.
Diffstat (limited to 'Documentation/devicetree/bindings')
-rw-r--r-- | Documentation/devicetree/bindings/input/touchscreen/raspberrypi,firmware-ts.txt | 26 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/serio/olpc,ap-sp.txt | 4 |
2 files changed, 30 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/input/touchscreen/raspberrypi,firmware-ts.txt b/Documentation/devicetree/bindings/input/touchscreen/raspberrypi,firmware-ts.txt new file mode 100644 index 000000000000..2a1af240ccc3 --- /dev/null +++ b/Documentation/devicetree/bindings/input/touchscreen/raspberrypi,firmware-ts.txt @@ -0,0 +1,26 @@ +Raspberry Pi firmware based 7" touchscreen +===================================== + +Required properties: + - compatible: "raspberrypi,firmware-ts" + +Optional properties: + - firmware: Reference to RPi's firmware device node + - touchscreen-size-x: See touchscreen.txt + - touchscreen-size-y: See touchscreen.txt + - touchscreen-inverted-x: See touchscreen.txt + - touchscreen-inverted-y: See touchscreen.txt + - touchscreen-swapped-x-y: See touchscreen.txt + +Example: + +firmware: firmware-rpi { + compatible = "raspberrypi,bcm2835-firmware"; + mboxes = <&mailbox>; + + ts: touchscreen { + compatible = "raspberrypi,firmware-ts"; + touchscreen-size-x = <800>; + touchscreen-size-y = <480>; + }; +}; diff --git a/Documentation/devicetree/bindings/serio/olpc,ap-sp.txt b/Documentation/devicetree/bindings/serio/olpc,ap-sp.txt index 0e72183f52bc..36603419d6f8 100644 --- a/Documentation/devicetree/bindings/serio/olpc,ap-sp.txt +++ b/Documentation/devicetree/bindings/serio/olpc,ap-sp.txt @@ -4,10 +4,14 @@ Required properties: - compatible : "olpc,ap-sp" - reg : base address and length of SoC's WTM registers - interrupts : SP-AP interrupt +- clocks : phandle + clock-specifier for the clock that drives the WTM +- clock-names: should be "sp" Example: ap-sp@d4290000 { compatible = "olpc,ap-sp"; reg = <0xd4290000 0x1000>; interrupts = <40>; + clocks = <&soc_clocks MMP2_CLK_SP>; + clock-names = "sp"; } |