From: Hector Martin <marcan@marcan.st>
To: Sven Peter <sven@svenpeter.dev>, Rob Herring <robh+dt@kernel.org>
Cc: Hector Martin <marcan@marcan.st>,
Alyssa Rosenzweig <alyssa@rosenzweig.io>,
Mark Kettenis <kettenis@openbsd.org>,
Marc Zyngier <maz@kernel.org>,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 3/4] dt-bindings: pci: apple,pcie: Add t6000 support
Date: Thu, 9 Dec 2021 14:10:00 +0900 [thread overview]
Message-ID: <20211209051001.70235-4-marcan@marcan.st> (raw)
In-Reply-To: <20211209051001.70235-1-marcan@marcan.st>
This new SoC is compatible with the existing driver, but the block
supports 4 downstream ports, so we need to adjust the binding to
allow that.
Signed-off-by: Hector Martin <marcan@marcan.st>
---
.../devicetree/bindings/pci/apple,pcie.yaml | 28 ++++++++++++++-----
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/Documentation/devicetree/bindings/pci/apple,pcie.yaml b/Documentation/devicetree/bindings/pci/apple,pcie.yaml
index ef1d424ec299..7f01e15fc81c 100644
--- a/Documentation/devicetree/bindings/pci/apple,pcie.yaml
+++ b/Documentation/devicetree/bindings/pci/apple,pcie.yaml
@@ -28,19 +28,17 @@ description: |
distributed over the root ports as the OS sees fit by programming
the PCIe controller's port registers.
-allOf:
- - $ref: /schemas/pci/pci-bus.yaml#
- - $ref: /schemas/interrupt-controller/msi-controller.yaml#
-
properties:
compatible:
items:
- - const: apple,t8103-pcie
+ - enum:
+ - apple,t8103-pcie
+ - apple,t6000-pcie
- const: apple,pcie
reg:
minItems: 3
- maxItems: 5
+ maxItems: 6
reg-names:
minItems: 3
@@ -50,6 +48,7 @@ properties:
- const: port0
- const: port1
- const: port2
+ - const: port3
ranges:
minItems: 2
@@ -59,7 +58,7 @@ properties:
description:
Interrupt specifiers, one for each root port.
minItems: 1
- maxItems: 3
+ maxItems: 4
msi-parent: true
@@ -81,6 +80,21 @@ required:
unevaluatedProperties: false
+allOf:
+ - $ref: /schemas/pci/pci-bus.yaml#
+ - $ref: /schemas/interrupt-controller/msi-controller.yaml#
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: apple,t8103-pcie
+ then:
+ properties:
+ reg:
+ maxItems: 5
+ interrupts:
+ maxItems: 3
+
examples:
- |
#include <dt-bindings/interrupt-controller/apple-aic.h>
--
2.33.0
next prev parent reply other threads:[~2021-12-09 5:10 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-09 5:09 [PATCH 0/4] dt-bindings: Add trivial Apple t6000/t6001 SoC bindings Hector Martin
2021-12-09 5:09 ` [PATCH 1/4] dt-bindings: arm: apple: Add t6000/t6001 MacBook Pro 14/16" compatibles Hector Martin
2021-12-09 14:19 ` Mark Kettenis
2021-12-09 17:12 ` Rob Herring
2021-12-09 5:09 ` [PATCH 2/4] dt-bindings: i2c: apple,i2c: Add apple,t6000-i2c compatible Hector Martin
2021-12-09 14:20 ` [PATCH 2/4] dt-bindings: i2c: apple, i2c: Add apple, t6000-i2c compatible Mark Kettenis
2021-12-09 16:34 ` [PATCH 2/4] dt-bindings: i2c: apple,i2c: Add apple,t6000-i2c compatible Sven Peter
2021-12-09 17:13 ` Rob Herring
2021-12-09 5:10 ` Hector Martin [this message]
2021-12-09 14:25 ` [PATCH 3/4] dt-bindings: pci: apple,pcie: Add t6000 support Mark Kettenis
2021-12-09 17:15 ` Rob Herring
2021-12-09 5:10 ` [PATCH 4/4] dt-bindings: pinctrl: apple,pinctrl: Add apple,t6000-pinctrl compatible Hector Martin
2021-12-09 14:25 ` [PATCH 4/4] dt-bindings: pinctrl: apple, pinctrl: Add apple, t6000-pinctrl compatible Mark Kettenis
2021-12-09 17:16 ` [PATCH 4/4] dt-bindings: pinctrl: apple,pinctrl: Add apple,t6000-pinctrl compatible Rob Herring
2021-12-12 4:04 ` [PATCH 0/4] dt-bindings: Add trivial Apple t6000/t6001 SoC bindings Hector Martin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211209051001.70235-4-marcan@marcan.st \
--to=marcan@marcan.st \
--cc=alyssa@rosenzweig.io \
--cc=devicetree@vger.kernel.org \
--cc=kettenis@openbsd.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=robh+dt@kernel.org \
--cc=sven@svenpeter.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®