diff options
author | 2019-08-11 23:24:46 -0700 | |
---|---|---|
committer | 2019-08-11 23:24:46 -0700 | |
commit | 4aa31b4b61e4985e719352c329c3948d1932cb64 (patch) | |
tree | 251d6d11d1e5c9c09adc3e0eb1715c56b2e16c95 /Documentation/devicetree/bindings/input | |
parent | Input: remove w90x900 touchscreen driver (diff) | |
parent | Linux 5.3-rc4 (diff) | |
download | wireguard-linux-4aa31b4b61e4985e719352c329c3948d1932cb64.tar.xz wireguard-linux-4aa31b4b61e4985e719352c329c3948d1932cb64.zip |
Merge tag 'v5.3-rc4' into next
Sync up with mainline to bring in device_property_count_u32 andother
newer APIs.
Diffstat (limited to 'Documentation/devicetree/bindings/input')
-rw-r--r-- | Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt b/Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt index 496125c6bfb7..507b737612ea 100644 --- a/Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt +++ b/Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt @@ -5,6 +5,7 @@ Required properties: - compatible: should be one of the following string: "allwinner,sun4i-a10-lradc-keys" "allwinner,sun8i-a83t-r-lradc" + "allwinner,sun50i-a64-lradc", "allwinner,sun8i-a83t-r-lradc" - reg: mmio address range of the chip - interrupts: interrupt to which the chip is connected - vref-supply: powersupply for the lradc reference voltage |