Commit 71287951 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/cadence' 

  - Deprecate 'cdns,max-outbound-regions' and 'cdns,no-bar-match-nbits'
    bindings in favor of deriving them from 'ranges' and 'dma-ranges'
    (Kishon Vijay Abraham I)

  - Read Vendor and Device ID as 32 bits (not 16) from DT (Kishon Vijay
    Abraham I)

* remotes/lorenzo/pci/cadence:
  PCI: cadence: Fix to read 32-bit Vendor ID/Device ID property from DT
  PCI: cadence: Remove "cdns,max-outbound-regions" DT property
  dt-bindings: PCI: cadence: Deprecate inbound/outbound specific bindings
parents a1dcc1aa 7fb39bf2

Documentation/devicetree/bindings/pci/cdns,cdns-pcie-ep.yaml

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ maintainers: 
  - Tom Joseph <tjoseph@cadence.com>



allOf:

  - $ref: "cdns-pcie.yaml#"

  - $ref: "cdns-pcie-ep.yaml#"

  - $ref: "pci-ep.yaml#"



properties:

Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml

+1 −2
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ examples: 
            #size-cells = <2>;

            bus-range = <0x0 0xff>;

            linux,pci-domain = <0>;

            cdns,max-outbound-regions = <16>;

            cdns,no-bar-match-nbits = <32>;

            vendor-id = <0x17cd>;

            device-id = <0x0200>;
@@ -57,6 +55,7 @@ examples: 


            ranges = <0x02000000 0x0 0x42000000  0x0 0x42000000  0x0 0x1000000>,

                     <0x01000000 0x0 0x43000000  0x0 0x43000000  0x0 0x0010000>;

            dma-ranges = <0x02000000 0x0 0x0 0x0 0x0 0x1 0x00000000>;



            #interrupt-cells = <0x1>;

Documentation/devicetree/bindings/pci/cdns-pcie-ep.yaml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: "http://devicetree.org/schemas/pci/cdns-pcie-ep.yaml#"

$schema: "http://devicetree.org/meta-schemas/core.yaml#"



title: Cadence PCIe Device



maintainers:

  - Tom Joseph <tjoseph@cadence.com>



allOf:

  - $ref: "cdns-pcie.yaml#"



properties:

  cdns,max-outbound-regions:

    description: maximum number of outbound regions

    allOf:

      - $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 1

    maximum: 32

    default: 32



required:

  - cdns,max-outbound-regions

Documentation/devicetree/bindings/pci/cdns-pcie-host.yaml

+10 −0
Original line number Diff line number Diff line
@@ -14,6 +14,15 @@ allOf: 
  - $ref: "cdns-pcie.yaml#"



properties:

  cdns,max-outbound-regions:

    description: maximum number of outbound regions

    allOf:

      - $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 1

    maximum: 32

    default: 32

    deprecated: true



  cdns,no-bar-match-nbits:

    description:

      Set into the no BAR match register to configure the number of least
@@ -23,5 +32,6 @@ properties: 
    minimum: 0

    maximum: 64

    default: 32

    deprecated: true



  msi-parent: true

Documentation/devicetree/bindings/pci/cdns-pcie.yaml

+0 −8
Original line number Diff line number Diff line
@@ -10,14 +10,6 @@ maintainers: 
  - Tom Joseph <tjoseph@cadence.com>



properties:

  cdns,max-outbound-regions:

    description: maximum number of outbound regions

    allOf:

      - $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 1

    maximum: 32

    default: 32



  phys:

    description:

      One per lane if more than one in the list. If only one PHY listed it must

CRA Git | Maintained and supported by SUSTech CRA and CCSE