summaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings/arm/tegra.yaml
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2021-02-23 13:33:13 +0300
committerJiri Kosina <jkosina@suse.cz>2021-02-23 13:33:13 +0300
commitd6310078d9f8c416e85f641a631aecf58f9c97ff (patch)
tree58ed5d9818ada3e970d93438083731abd6293ba9 /Documentation/devicetree/bindings/arm/tegra.yaml
parentf8dd50e097b221e35c34b844826db92158ec18c2 (diff)
parentdf7b622906f24be954beca94e60c195fde65c6d5 (diff)
downloadlinux-d6310078d9f8c416e85f641a631aecf58f9c97ff.tar.xz
Merge branch 'for-5.12/google' into for-linus
- User experience improvements for hid-google from Nicolas Boichat
Diffstat (limited to 'Documentation/devicetree/bindings/arm/tegra.yaml')
-rw-r--r--Documentation/devicetree/bindings/arm/tegra.yaml3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/tegra.yaml b/Documentation/devicetree/bindings/arm/tegra.yaml
index 767e86354c8e..c5fbf869aa93 100644
--- a/Documentation/devicetree/bindings/arm/tegra.yaml
+++ b/Documentation/devicetree/bindings/arm/tegra.yaml
@@ -72,6 +72,9 @@ properties:
- const: asus,grouper
- const: nvidia,tegra30
- items:
+ - const: ouya,ouya
+ - const: nvidia,tegra30
+ - items:
- enum:
- nvidia,dalmore
- nvidia,roth