Merge branch 'pci/dt-binding'

- Add Rockchip RK3528 compatible strings in DT binding (Yao Zi) - Add Qualcomm Kaanapali to SM8550 DT binding (Qiang Yu) - Add 'contains' to the 'select' schema to enable the amlogic,axg-pcie binding (Rob Herring) - Update Manivannan Sadhasivam's email address in bindings (Manivannan Sadhasivam) - Add required 'power-domains' and 'resets' to qcom sa8775p, sc7280, sc8280xp, sm8150, sm8250, sm8350, sm8450, sm8550, x1e80100 DT schemas (Krzysztof Kozlowski) * pci/dt-binding: dt-bindings: PCI: qcom,pcie-x1e80100: Add missing required power-domains and resets dt-bindings: PCI: qcom,pcie-sm8550: Add missing required power-domains and resets dt-bindings: PCI: qcom,pcie-sm8450: Add missing required power-domains and resets dt-bindings: PCI: qcom,pcie-sm8350: Add missing required power-domains and resets dt-bindings: PCI: qcom,pcie-sm8250: Add missing required power-domains and resets dt-bindings: PCI: qcom,pcie-sm8150: Add missing required power-domains and resets dt-bindings: PCI: qcom,pcie-sc8280xp: Add missing required power-domains and resets dt-bindings: PCI: qcom,pcie-sc7280: Add missing required power-domains and resets dt-bindings: PCI: qcom,pcie-sa8775p: Add missing required power-domains and resets dt-bindings: PCI: Update the email address for Manivannan Sadhasivam dt-bindings: PCI: amlogic,axg-pcie: Fix select schema dt-bindings: PCI: qcom,pcie-sm8550: Add Kaanapali compatible dt-bindings: PCI: dwc: rockchip: Add RK3528 variant
2025-12-03 14:18:33 -06:00 · 2025-12-03 14:18:33 -06:00 · f26a75c9b3
parent 13571584e1 3b83eea633
commit f26a75c9b3
18 changed files with 72 additions and 26 deletions
--- a/Documentation/devicetree/bindings/pci/amlogic,axg-pcie.yaml
+++ b/Documentation/devicetree/bindings/pci/amlogic,axg-pcie.yaml
@ -20,9 +20,10 @@ allOf:
 select:
  properties:
    compatible:
-      enum:
-        - amlogic,axg-pcie
-        - amlogic,g12a-pcie
+      contains:
+        enum:
+          - amlogic,axg-pcie
+          - amlogic,g12a-pcie
  required:
    - compatible

@ -51,15 +52,15 @@ properties:

  clocks:
    items:
+      - description: PCIe PHY clock
      - description: PCIe GEN 100M PLL clock
      - description: PCIe RC clock gate
-      - description: PCIe PHY clock

  clock-names:
    items:
+      - const: general
      - const: pclk
      - const: port
-      - const: general

  phys:
    maxItems: 1
@ -88,7 +89,7 @@ required:
  - reg
  - reg-names
  - interrupts
-  - clock
+  - clocks
  - clock-names
  - "#address-cells"
  - "#size-cells"
@ -115,8 +116,8 @@ examples:
        reg = <0xf9800000 0x400000>, <0xff646000 0x2000>, <0xf9f00000 0x100000>;
        reg-names = "elbi", "cfg", "config";
        interrupts = <GIC_SPI 177 IRQ_TYPE_EDGE_RISING>;
-        clocks = <&pclk>, <&clk_port>, <&clk_phy>;
-        clock-names = "pclk", "port", "general";
+        clocks = <&clk_phy>, <&pclk>, <&clk_port>;
+        clock-names = "general", "pclk", "port";
        resets = <&reset_pcie_port>, <&reset_pcie_apb>;
        reset-names = "port", "apb";
        phys = <&pcie_phy>;
--- a/Documentation/devicetree/bindings/pci/pci-ep.yaml
+++ b/Documentation/devicetree/bindings/pci/pci-ep.yaml
@ -11,7 +11,7 @@ description: |

 maintainers:
  - Kishon Vijay Abraham I <kishon@kernel.org>
-  - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+  - Manivannan Sadhasivam <mani@kernel.org>

 properties:
  $nodename:
--- a/Documentation/devicetree/bindings/pci/qcom,pcie-common.yaml
+++ b/Documentation/devicetree/bindings/pci/qcom,pcie-common.yaml
@ -8,7 +8,7 @@ title: Qualcomm PCI Express Root Complex Common Properties

 maintainers:
  - Bjorn Andersson <andersson@kernel.org>
-  - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+  - Manivannan Sadhasivam <mani@kernel.org>

 properties:
  reg:
--- a/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml
+++ b/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml
@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
 title: Qualcomm PCIe Endpoint Controller

 maintainers:
-  - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+  - Manivannan Sadhasivam <mani@kernel.org>

 properties:
  compatible:
--- a/Documentation/devicetree/bindings/pci/qcom,pcie-sa8255p.yaml
+++ b/Documentation/devicetree/bindings/pci/qcom,pcie-sa8255p.yaml
@ -8,7 +8,7 @@ title: Qualcomm SA8255p based firmware managed and ECAM compliant PCIe Root Comp

 maintainers:
  - Bjorn Andersson <andersson@kernel.org>
-  - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+  - Manivannan Sadhasivam <mani@kernel.org>

 description:
  Qualcomm SA8255p SoC PCIe root complex controller is based on the Synopsys
--- a/Documentation/devicetree/bindings/pci/qcom,pcie-sa8775p.yaml
+++ b/Documentation/devicetree/bindings/pci/qcom,pcie-sa8775p.yaml
@ -8,7 +8,7 @@ title: Qualcomm SA8775p PCI Express Root Complex

 maintainers:
  - Bjorn Andersson <andersson@kernel.org>
-  - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+  - Manivannan Sadhasivam <mani@kernel.org>

 description:
  Qualcomm SA8775p SoC PCIe root complex controller is based on the Synopsys
@ -78,6 +78,9 @@ properties:
 required:
  - interconnects
  - interconnect-names
+  - power-domains
+  - resets
+  - reset-names

 allOf:
  - $ref: qcom,pcie-common.yaml#
--- a/Documentation/devicetree/bindings/pci/qcom,pcie-sc7280.yaml
+++ b/Documentation/devicetree/bindings/pci/qcom,pcie-sc7280.yaml
@ -8,7 +8,7 @@ title: Qualcomm SC7280 PCI Express Root Complex

 maintainers:
  - Bjorn Andersson <andersson@kernel.org>
-  - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+  - Manivannan Sadhasivam <mani@kernel.org>

 description:
  Qualcomm SC7280 SoC PCIe root complex controller is based on the Synopsys
@ -76,6 +76,11 @@ properties:
    items:
      - const: pci

+required:
+  - power-domains
+  - resets
+  - reset-names
+
 allOf:
  - $ref: qcom,pcie-common.yaml#

--- a/Documentation/devicetree/bindings/pci/qcom,pcie-sc8180x.yaml
+++ b/Documentation/devicetree/bindings/pci/qcom,pcie-sc8180x.yaml
@ -8,7 +8,7 @@ title: Qualcomm SC8180x PCI Express Root Complex

 maintainers:
  - Bjorn Andersson <andersson@kernel.org>
-  - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+  - Manivannan Sadhasivam <mani@kernel.org>

 description:
  Qualcomm SC8180x SoC PCIe root complex controller is based on the Synopsys
--- a/Documentation/devicetree/bindings/pci/qcom,pcie-sc8280xp.yaml
+++ b/Documentation/devicetree/bindings/pci/qcom,pcie-sc8280xp.yaml
@ -8,7 +8,7 @@ title: Qualcomm SC8280XP PCI Express Root Complex

 maintainers:
  - Bjorn Andersson <andersson@kernel.org>
-  - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+  - Manivannan Sadhasivam <mani@kernel.org>

 description:
  Qualcomm SC8280XP SoC PCIe root complex controller is based on the Synopsys
@ -61,6 +61,9 @@ properties:
 required:
  - interconnects
  - interconnect-names
+  - power-domains
+  - resets
+  - reset-names

 allOf:
  - $ref: qcom,pcie-common.yaml#
--- a/Documentation/devicetree/bindings/pci/qcom,pcie-sm8150.yaml
+++ b/Documentation/devicetree/bindings/pci/qcom,pcie-sm8150.yaml
@ -8,7 +8,7 @@ title: Qualcomm SM8150 PCI Express Root Complex

 maintainers:
  - Bjorn Andersson <andersson@kernel.org>
-  - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+  - Manivannan Sadhasivam <mani@kernel.org>

 description:
  Qualcomm SM8150 SoC PCIe root complex controller is based on the Synopsys
@ -74,6 +74,11 @@ properties:
    items:
      - const: pci

+required:
+  - power-domains
+  - resets
+  - reset-names
+
 allOf:
  - $ref: qcom,pcie-common.yaml#

--- a/Documentation/devicetree/bindings/pci/qcom,pcie-sm8250.yaml
+++ b/Documentation/devicetree/bindings/pci/qcom,pcie-sm8250.yaml
@ -8,7 +8,7 @@ title: Qualcomm SM8250 PCI Express Root Complex

 maintainers:
  - Bjorn Andersson <andersson@kernel.org>
-  - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+  - Manivannan Sadhasivam <mani@kernel.org>

 description:
  Qualcomm SM8250 SoC PCIe root complex controller is based on the Synopsys
@ -83,6 +83,11 @@ properties:
    items:
      - const: pci

+required:
+  - power-domains
+  - resets
+  - reset-names
+
 allOf:
  - $ref: qcom,pcie-common.yaml#

--- a/Documentation/devicetree/bindings/pci/qcom,pcie-sm8350.yaml
+++ b/Documentation/devicetree/bindings/pci/qcom,pcie-sm8350.yaml
@ -8,7 +8,7 @@ title: Qualcomm SM8350 PCI Express Root Complex

 maintainers:
  - Bjorn Andersson <andersson@kernel.org>
-  - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+  - Manivannan Sadhasivam <mani@kernel.org>

 description:
  Qualcomm SM8350 SoC PCIe root complex controller is based on the Synopsys
@ -73,6 +73,11 @@ properties:
    items:
      - const: pci

+required:
+  - power-domains
+  - resets
+  - reset-names
+
 allOf:
  - $ref: qcom,pcie-common.yaml#

--- a/Documentation/devicetree/bindings/pci/qcom,pcie-sm8450.yaml
+++ b/Documentation/devicetree/bindings/pci/qcom,pcie-sm8450.yaml
@ -8,7 +8,7 @@ title: Qualcomm SM8450 PCI Express Root Complex

 maintainers:
  - Bjorn Andersson <andersson@kernel.org>
-  - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+  - Manivannan Sadhasivam <mani@kernel.org>

 description:
  Qualcomm SM8450 SoC PCIe root complex controller is based on the Synopsys
@ -77,6 +77,11 @@ properties:
    items:
      - const: pci

+required:
+  - power-domains
+  - resets
+  - reset-names
+
 allOf:
  - $ref: qcom,pcie-common.yaml#

--- a/Documentation/devicetree/bindings/pci/qcom,pcie-sm8550.yaml
+++ b/Documentation/devicetree/bindings/pci/qcom,pcie-sm8550.yaml
@ -8,7 +8,7 @@ title: Qualcomm SM8550 PCI Express Root Complex

 maintainers:
  - Bjorn Andersson <andersson@kernel.org>
-  - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+  - Manivannan Sadhasivam <mani@kernel.org>

 description:
  Qualcomm SM8550 SoC (and compatible) PCIe root complex controller is based on
@ -20,6 +20,7 @@ properties:
      - const: qcom,pcie-sm8550
      - items:
          - enum:
+              - qcom,kaanapali-pcie
              - qcom,sar2130p-pcie
              - qcom,pcie-sm8650
              - qcom,pcie-sm8750
@ -83,6 +84,11 @@ properties:
      - const: pci # PCIe core reset
      - const: link_down # PCIe link down reset

+required:
+  - power-domains
+  - resets
+  - reset-names
+
 allOf:
  - $ref: qcom,pcie-common.yaml#

--- a/Documentation/devicetree/bindings/pci/qcom,pcie-x1e80100.yaml
+++ b/Documentation/devicetree/bindings/pci/qcom,pcie-x1e80100.yaml
@ -8,7 +8,7 @@ title: Qualcomm X1E80100 PCI Express Root Complex

 maintainers:
  - Bjorn Andersson <andersson@kernel.org>
-  - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+  - Manivannan Sadhasivam <mani@kernel.org>

 description:
  Qualcomm X1E80100 SoC (and compatible) PCIe root complex controller is based on
@ -73,6 +73,11 @@ properties:
      - const: pci # PCIe core reset
      - const: link_down # PCIe link down reset

+required:
+  - power-domains
+  - resets
+  - reset-names
+
 allOf:
  - $ref: qcom,pcie-common.yaml#

--- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
+++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
@ -8,7 +8,7 @@ title: Qualcomm PCI express root complex

 maintainers:
  - Bjorn Andersson <bjorn.andersson@linaro.org>
-  - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+  - Manivannan Sadhasivam <mani@kernel.org>

 description: |
  Qualcomm PCIe root complex controller is based on the Synopsys DesignWare
--- a/Documentation/devicetree/bindings/pci/rockchip-dw-pcie.yaml
+++ b/Documentation/devicetree/bindings/pci/rockchip-dw-pcie.yaml
@ -22,6 +22,7 @@ properties:
      - const: rockchip,rk3568-pcie
      - items:
          - enum:
+              - rockchip,rk3528-pcie
              - rockchip,rk3562-pcie
              - rockchip,rk3576-pcie
              - rockchip,rk3588-pcie
@ -78,6 +79,7 @@ allOf:
          compatible:
            contains:
              enum:
+                - rockchip,rk3528-pcie
                - rockchip,rk3562-pcie
                - rockchip,rk3576-pcie
    then:
@ -89,6 +91,7 @@ allOf:
        compatible:
          contains:
            enum:
+              - rockchip,rk3528-pcie
              - rockchip,rk3562-pcie
              - rockchip,rk3576-pcie
    then:
--- a/Documentation/devicetree/bindings/pci/snps,dw-pcie-common.yaml
+++ b/Documentation/devicetree/bindings/pci/snps,dw-pcie-common.yaml
@ -115,11 +115,11 @@ properties:
            above for new bindings.
          oneOf:
            - description: See native 'dbi' clock for details
-              enum: [ pcie, pcie_apb_sys, aclk_dbi, reg ]
+              enum: [ pcie, pcie_apb_sys, aclk_dbi, reg, port ]
            - description: See native 'mstr/slv' clock for details
              enum: [ pcie_bus, pcie_inbound_axi, pcie_aclk, aclk_mst, aclk_slv ]
            - description: See native 'pipe' clock for details
-              enum: [ pcie_phy, pcie_phy_ref, link ]
+              enum: [ pcie_phy, pcie_phy_ref, link, general ]
            - description: See native 'aux' clock for details
              enum: [ pcie_aux ]
            - description: See native 'ref' clock for details.
@ -176,7 +176,7 @@ properties:
            - description: See native 'phy' reset for details
              enum: [ pciephy, link ]
            - description: See native 'pwr' reset for details
-              enum: [ turnoff ]
+              enum: [ turnoff, port ]

  phys:
    description: