Skip to content

Commit 1e90e26

Browse files
committed
Merge branch 'next' into for-linus
Prepare input updates for 5.19 merge window.
2 parents b26ff91 + 5f76955 commit 1e90e26

File tree

94 files changed

+4170
-364
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+4170
-364
lines changed

Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,20 @@ properties:
1818
- items:
1919
- const: allwinner,sun50i-a64-lradc
2020
- const: allwinner,sun8i-a83t-r-lradc
21+
- const: allwinner,sun50i-r329-lradc
22+
- items:
23+
- const: allwinner,sun20i-d1-lradc
24+
- const: allwinner,sun50i-r329-lradc
2125

2226
reg:
2327
maxItems: 1
2428

29+
clocks:
30+
maxItems: 1
31+
32+
resets:
33+
maxItems: 1
34+
2535
interrupts:
2636
maxItems: 1
2737

@@ -68,6 +78,18 @@ required:
6878
- interrupts
6979
- vref-supply
7080

81+
if:
82+
properties:
83+
compatible:
84+
contains:
85+
enum:
86+
- allwinner,sun50i-r329-lradc
87+
88+
then:
89+
required:
90+
- clocks
91+
- resets
92+
7193
additionalProperties: false
7294

7395
examples:

0 commit comments

Comments
 (0)