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

Merge branch 'pci/controller/qcom' 

- Configure controller so MHI bus master clock will be switched off while
  in ASPM L1.x states (Manivannan Sadhasivam)

- Add sa8775p DT binding and driver support (Mrinmay Sarkar)

- Fix broken DT SDX65 "compatible" property (Krzysztof Kozlowski)

* pci/controller/qcom:
  dt-bindings: PCI: qcom: Fix SDX65 compatible
  PCI: qcom: Add support for sa8775p SoC
  dt-bindings: PCI: qcom: Add sa8775p compatible
  PCI: qcom-ep: Switch MHI bus master clock off during L1SS
parents 26d74926 15d63a89

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

+7 −5
Original line number Diff line number Diff line
@@ -11,10 +11,13 @@ maintainers: 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - qcom,sdx55-pcie-ep

      - qcom,sdx65-pcie-ep

          - qcom,sm8450-pcie-ep

      - items:

          - const: qcom,sdx65-pcie-ep

          - const: qcom,sdx55-pcie-ep



  reg:

    items:
@@ -110,7 +113,6 @@ allOf: 
          contains:

            enum:

              - qcom,sdx55-pcie-ep

              - qcom,sdx65-pcie-ep

    then:

      properties:

        clocks:

Documentation/devicetree/bindings/pci/qcom,pcie.yaml

+28 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ properties: 
          - qcom,pcie-msm8996

          - qcom,pcie-qcs404

          - qcom,pcie-sa8540p

          - qcom,pcie-sa8775p

          - qcom,pcie-sc7280

          - qcom,pcie-sc8180x

          - qcom,pcie-sc8280xp
@@ -211,6 +212,7 @@ allOf: 
        compatible:

          contains:

            enum:

              - qcom,pcie-sa8775p

              - qcom,pcie-sc7280

              - qcom,pcie-sc8180x

              - qcom,pcie-sc8280xp
@@ -743,12 +745,37 @@ allOf: 
          items:

            - const: pci # PCIe core reset



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,pcie-sa8775p

    then:

      properties:

        clocks:

          minItems: 5

          maxItems: 5

        clock-names:

          items:

            - const: aux # Auxiliary clock

            - const: cfg # Configuration clock

            - const: bus_master # Master AXI clock

            - const: bus_slave # Slave AXI clock

            - const: slave_q2a # Slave Q2A clock

        resets:

          maxItems: 1

        reset-names:

          items:

            - const: pci # PCIe core reset



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,pcie-sa8540p

              - qcom,pcie-sa8775p

              - qcom,pcie-sc8280xp

    then:

      required:
@@ -790,6 +817,7 @@ allOf: 
          contains:

            enum:

              - qcom,pcie-msm8996

              - qcom,pcie-sa8775p

              - qcom,pcie-sc7280

              - qcom,pcie-sc8180x

              - qcom,pcie-sdm845

drivers/pci/controller/dwc/pcie-qcom-ep.c

+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ static int qcom_pcie_perst_deassert(struct dw_pcie *pci) 
	/* Gate Master AXI clock to MHI bus during L1SS */

	val = readl_relaxed(pcie_ep->parf + PARF_MHI_CLOCK_RESET_CTRL);

	val &= ~PARF_MSTR_AXI_CLK_EN;

	val = readl_relaxed(pcie_ep->parf + PARF_MHI_CLOCK_RESET_CTRL);

	writel_relaxed(val, pcie_ep->parf + PARF_MHI_CLOCK_RESET_CTRL);



	dw_pcie_ep_init_notify(&pcie_ep->pci.ep);

drivers/pci/controller/dwc/pcie-qcom.c

+1 −0
Original line number Diff line number Diff line
@@ -1613,6 +1613,7 @@ static const struct of_device_id qcom_pcie_match[] = { 
	{ .compatible = "qcom,pcie-msm8996", .data = &cfg_2_3_2 },

	{ .compatible = "qcom,pcie-qcs404", .data = &cfg_2_4_0 },

	{ .compatible = "qcom,pcie-sa8540p", .data = &cfg_1_9_0 },

	{ .compatible = "qcom,pcie-sa8775p", .data = &cfg_1_9_0},

	{ .compatible = "qcom,pcie-sc7280", .data = &cfg_1_9_0 },

	{ .compatible = "qcom,pcie-sc8180x", .data = &cfg_1_9_0 },

	{ .compatible = "qcom,pcie-sc8280xp", .data = &cfg_1_9_0 },