summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2021-12-13 15:03:55 +0100
committerArnd Bergmann <arnd@arndb.de>2021-12-13 15:03:56 +0100
commitf6bdc6106727b4d7f1dde51ba664386ce654477e (patch)
tree7ef81b23b2651d69ac79692f5bb55dcc22ac7086 /Documentation
parentddae25ed97f5e4e2cbc5c119687e18b9198525e0 (diff)
parent0668639eaf14813a39a8d3e0e6597d568581d4ea (diff)
downloadlinux-stable-f6bdc6106727b4d7f1dde51ba664386ce654477e.tar.gz
linux-stable-f6bdc6106727b4d7f1dde51ba664386ce654477e.tar.bz2
linux-stable-f6bdc6106727b4d7f1dde51ba664386ce654477e.zip
Merge tag 'asahi-soc-fixes-5.16' of https://github.com/AsahiLinux/linux into arm/fixes
Asahi SoC DT/binding fixes for 5.16. Just some minor DT fixups we found after things got merged. * tag 'asahi-soc-fixes-5.16' of https://github.com/AsahiLinux/linux: arm64: dts: apple: add #interrupt-cells property to pinctrl nodes dt-bindings: i2c: apple,i2c: allow multiple compatibles arm64: dts: apple: change ethernet0 device type to ethernet Link: https://lore.kernel.org/r/cc9a1a67-3b2d-ae9f-5733-859111eb78c1@marcan.st Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/i2c/apple,i2c.yaml8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/i2c/apple,i2c.yaml b/Documentation/devicetree/bindings/i2c/apple,i2c.yaml
index 22fc8483256f..82b953181a52 100644
--- a/Documentation/devicetree/bindings/i2c/apple,i2c.yaml
+++ b/Documentation/devicetree/bindings/i2c/apple,i2c.yaml
@@ -20,9 +20,9 @@ allOf:
properties:
compatible:
- enum:
- - apple,t8103-i2c
- - apple,i2c
+ items:
+ - const: apple,t8103-i2c
+ - const: apple,i2c
reg:
maxItems: 1
@@ -51,7 +51,7 @@ unevaluatedProperties: false
examples:
- |
i2c@35010000 {
- compatible = "apple,t8103-i2c";
+ compatible = "apple,t8103-i2c", "apple,i2c";
reg = <0x35010000 0x4000>;
interrupt-parent = <&aic>;
interrupts = <0 627 4>;