Re: [PATCH 1/2] dt-bindings: nvme: Add apple,t8132-nvme-ans2 compatible
Rob Herring <[email protected]>
| Newsgroups | dev.linux.lists.asahi,org.infradead.lists.linux-arm-kernel,org.infradead.lists.linux-nvme,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
On Tue, Aug 11, 2026 at 10:49:47PM +0200, Yureka Lilian wrote: > Add a new base compatible for the ANS2 NVMe on the Apple t8132 (M4) SoC, > which uses a separate MMIO base for its NVMMU. > > Signed-off-by: Yureka Lilian <[email protected]> > --- > .../devicetree/bindings/nvme/apple,nvme-ans.yaml | 77 ++++++++++++++-------- > 1 file changed, 48 insertions(+), 29 deletions(-) > > diff --git a/Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml b/Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml > index 4c0b1f90aff8..c8a41b268b9c 100644 > --- a/Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml > +++ b/Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml > @@ -16,6 +16,7 @@ properties: > - items: > - const: apple,t6020-nvme-ans2 > - const: apple,t8103-nvme-ans2 > + - const: apple,t8132-nvme-ans2 > - items: > - enum: > # Do not add additional SoC to this list. > @@ -24,16 +25,6 @@ properties: > - apple,t6000-nvme-ans2 > - const: apple,nvme-ans2 > > - reg: > - items: > - - description: NVMe and NVMMU registers > - - description: ANS2 co-processor control registers > - > - reg-names: > - items: > - - const: nvme > - - const: ans > - Keep properties defined at the top level. More below. > resets: > maxItems: 1 > > @@ -68,25 +59,53 @@ properties: > > The SART address filter is documented in iommu/apple,sart.yaml. > > -if: > - properties: > - compatible: > - contains: > - enum: > - - apple,t6000-nvme-ans2 > - - apple,t6020-nvme-ans2 > -then: > - properties: > - power-domains: > - minItems: 3 > - power-domain-names: > - minItems: 3 > -else: > - properties: > - power-domains: > - maxItems: 2 > - power-domain-names: > - maxItems: 2 > +allOf: > + - if: > + properties: > + compatible: > + contains: > + const: apple,t8132-nvme-ans2 > + then: > + properties: > + reg: > + items: > + - description: NVMMU registers > + - description: NVMe registers > + - description: ANS2 co-processor control registers > + reg-names: > + items: > + - const: nvmmu > + - const: nvme > + - const: ans New entries go on the end. So nvmmu last and defined at the top level. Then this is just 'minItems: 3' > + else: > + properties: > + reg: > + items: > + - description: NVMe and NVMMU registers > + - description: ANS2 co-processor control registers > + reg-names: > + items: > + - const: nvme > + - const: ans And 'maxItems: 2' on these 2. Rob