[PATCH 1/4] dt-bindings: PCI: qcom: add MSM8998 specific compatible

[PATCH 1/4] dt-bindings: PCI: qcom: add MSM8998 specific compatible

[Krzysztof Kozlowski]

Add new compatible for MSM8998 (compatible with MSM8996) to allow
further customizing if needed and to accurately describe the hardware.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 .../devicetree/bindings/pci/qcom,pcie.yaml    | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
index 54f07852d279..0411e2e67661 100644
--- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
+++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
@@ -16,25 +16,29 @@ description: |
 
 properties:
   compatible:
-    enum:
-      - qcom,pcie-ipq8064
-      - qcom,pcie-ipq8064-v2
-      - qcom,pcie-apq8064
-      - qcom,pcie-apq8084
-      - qcom,pcie-msm8996
-      - qcom,pcie-ipq4019
-      - qcom,pcie-ipq8074
-      - qcom,pcie-qcs404
-      - qcom,pcie-sa8540p
-      - qcom,pcie-sc7280
-      - qcom,pcie-sc8180x
-      - qcom,pcie-sc8280xp
-      - qcom,pcie-sdm845
-      - qcom,pcie-sm8150
-      - qcom,pcie-sm8250
-      - qcom,pcie-sm8450-pcie0
-      - qcom,pcie-sm8450-pcie1
-      - qcom,pcie-ipq6018
+    oneOf:
+      - enum:
+          - qcom,pcie-ipq8064
+          - qcom,pcie-ipq8064-v2
+          - qcom,pcie-apq8064
+          - qcom,pcie-apq8084
+          - qcom,pcie-msm8996
+          - qcom,pcie-ipq4019
+          - qcom,pcie-ipq8074
+          - qcom,pcie-qcs404
+          - qcom,pcie-sa8540p
+          - qcom,pcie-sc7280
+          - qcom,pcie-sc8180x
+          - qcom,pcie-sc8280xp
+          - qcom,pcie-sdm845
+          - qcom,pcie-sm8150
+          - qcom,pcie-sm8250
+          - qcom,pcie-sm8450-pcie0
+          - qcom,pcie-sm8450-pcie1
+          - qcom,pcie-ipq6018
+      - items:
+          - const: qcom,pcie-msm8998
+          - const: qcom,pcie-msm8996
 
   reg:
     minItems: 4
-- 
2.34.1

[PATCH 2/4] dt-bindings: PCI: qcom: unify clock order between MSM8996 and MSM8998

[Krzysztof Kozlowski]

MSM8996 and MSM8998 use the same clocks, so use one order to make the
binding simpler.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 .../devicetree/bindings/pci/qcom,pcie.yaml    | 24 ++++++-------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
index 0411e2e67661..ee719e879ce3 100644
--- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
+++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
@@ -306,27 +306,17 @@ allOf:
             enum:
               - qcom,pcie-msm8996
     then:
-      oneOf:
-        - properties:
-            clock-names:
-              items:
-                - const: pipe # Pipe Clock driving internal logic
-                - const: aux # Auxiliary (AUX) clock
-                - const: cfg # Configuration clock
-                - const: bus_master # Master AXI clock
-                - const: bus_slave # Slave AXI clock
-        - properties:
-            clock-names:
-              items:
-                - const: pipe # Pipe Clock driving internal logic
-                - const: bus_master # Master AXI clock
-                - const: bus_slave # Slave AXI clock
-                - const: cfg # Configuration clock
-                - const: aux # Auxiliary (AUX) clock
       properties:
         clocks:
           minItems: 5
           maxItems: 5
+        clock-names:
+          items:
+            - const: pipe # Pipe Clock driving internal logic
+            - const: aux # Auxiliary (AUX) clock
+            - const: cfg # Configuration clock
+            - const: bus_master # Master AXI clock
+            - const: bus_slave # Slave AXI clock
         resets: false
         reset-names: false
 
-- 
2.34.1

[PATCH 3/4] arm64: dts: msm8998: add MSM8998 specific compatible

[Krzysztof Kozlowski]

Add new compatible for MSM8998 (compatible with MSM8996) to allow
further customizing if needed and to accurately describe the hardware.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
index da2dd87e3f4f..320a28232a32 100644
--- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
@@ -900,7 +900,7 @@ anoc2_smmu: iommu@16c0000 {
 		};
 
 		pcie0: pci@1c00000 {
-			compatible = "qcom,pcie-msm8996";
+			compatible = "qcom,pcie-msm8998", "qcom,pcie-msm8996";
 			reg =	<0x01c00000 0x2000>,
 				<0x1b000000 0xf1d>,
 				<0x1b000f20 0xa8>,
-- 
2.34.1

[PATCH 4/4] arm64: dts: msm8998: unify PCIe clock order withMSM8996

[Krzysztof Kozlowski]

PCIe on MSM8996 and MSM8998 use the same clocks, so use one order to
make the binding simpler.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm64/boot/dts/qcom/msm8998.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
index 320a28232a32..539382dab0ad 100644
--- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
@@ -929,11 +929,11 @@ pcie0: pci@1c00000 {
 					<0 0 0 4 &intc 0 0 139 IRQ_TYPE_LEVEL_HIGH>;
 
 			clocks = <&gcc GCC_PCIE_0_PIPE_CLK>,
-				 <&gcc GCC_PCIE_0_MSTR_AXI_CLK>,
-				 <&gcc GCC_PCIE_0_SLV_AXI_CLK>,
+				 <&gcc GCC_PCIE_0_AUX_CLK>,
 				 <&gcc GCC_PCIE_0_CFG_AHB_CLK>,
-				 <&gcc GCC_PCIE_0_AUX_CLK>;
-			clock-names = "pipe", "bus_master", "bus_slave", "cfg", "aux";
+				 <&gcc GCC_PCIE_0_MSTR_AXI_CLK>,
+				 <&gcc GCC_PCIE_0_SLV_AXI_CLK>;
+			clock-names = "pipe", "aux", "cfg", "bus_master", "bus_slave";
 
 			power-domains = <&gcc PCIE_0_GDSC>;
 			iommu-map = <0x100 &anoc1_smmu 0x1480 1>;
-- 
2.34.1

Re: [PATCH 3/4] arm64: dts: msm8998: add MSM8998 specific compatible

[Konrad Dybcio]

On 15/11/2022 13:53, Krzysztof Kozlowski wrote:
> Add new compatible for MSM8998 (compatible with MSM8996) to allow
> further customizing if needed and to accurately describe the hardware.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>   arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
> index da2dd87e3f4f..320a28232a32 100644
> --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
> @@ -900,7 +900,7 @@ anoc2_smmu: iommu@16c0000 {
>   		};
>   
>   		pcie0: pci@1c00000 {
> -			compatible = "qcom,pcie-msm8996";
> +			compatible = "qcom,pcie-msm8998", "qcom,pcie-msm8996";
>   			reg =	<0x01c00000 0x2000>,
>   				<0x1b000000 0xf1d>,
>   				<0x1b000f20 0xa8>,

Re: [PATCH 4/4] arm64: dts: msm8998: unify PCIe clock order withMSM8996

[Konrad Dybcio]

On 15/11/2022 13:53, Krzysztof Kozlowski wrote:
> PCIe on MSM8996 and MSM8998 use the same clocks, so use one order to
> make the binding simpler.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>   arch/arm64/boot/dts/qcom/msm8998.dtsi | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
> index 320a28232a32..539382dab0ad 100644
> --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
> @@ -929,11 +929,11 @@ pcie0: pci@1c00000 {
>   					<0 0 0 4 &intc 0 0 139 IRQ_TYPE_LEVEL_HIGH>;
>   
>   			clocks = <&gcc GCC_PCIE_0_PIPE_CLK>,
> -				 <&gcc GCC_PCIE_0_MSTR_AXI_CLK>,
> -				 <&gcc GCC_PCIE_0_SLV_AXI_CLK>,
> +				 <&gcc GCC_PCIE_0_AUX_CLK>,
>   				 <&gcc GCC_PCIE_0_CFG_AHB_CLK>,
> -				 <&gcc GCC_PCIE_0_AUX_CLK>;
> -			clock-names = "pipe", "bus_master", "bus_slave", "cfg", "aux";
> +				 <&gcc GCC_PCIE_0_MSTR_AXI_CLK>,
> +				 <&gcc GCC_PCIE_0_SLV_AXI_CLK>;
> +			clock-names = "pipe", "aux", "cfg", "bus_master", "bus_slave";
>   
>   			power-domains = <&gcc PCIE_0_GDSC>;
>   			iommu-map = <0x100 &anoc1_smmu 0x1480 1>;

Re: (subset) [PATCH 1/4] dt-bindings: PCI: qcom: add MSM8998 specific compatible

[Bjorn Andersson]

On Tue, 15 Nov 2022 13:53:07 +0100, Krzysztof Kozlowski wrote:
> Add new compatible for MSM8998 (compatible with MSM8996) to allow
> further customizing if needed and to accurately describe the hardware.
> 
> 

Applied, thanks!

[3/4] arm64: dts: msm8998: add MSM8998 specific compatible
      commit: 0d70d5f6614e15bdc269b630b7f884889568b1bb
[4/4] arm64: dts: msm8998: unify PCIe clock order withMSM8996
      commit: b132731bb936cfe0ee26790eeb51572d12dbf854

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>

Re: [PATCH 1/4] dt-bindings: PCI: qcom: add MSM8998 specific compatible

[Rob Herring]

On Tue, 15 Nov 2022 13:53:07 +0100, Krzysztof Kozlowski wrote:
> Add new compatible for MSM8998 (compatible with MSM8996) to allow
> further customizing if needed and to accurately describe the hardware.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
>  .../devicetree/bindings/pci/qcom,pcie.yaml    | 42 ++++++++++---------
>  1 file changed, 23 insertions(+), 19 deletions(-)
> 

Acked-by: Rob Herring <robh@kernel.org>

Re: [PATCH 2/4] dt-bindings: PCI: qcom: unify clock order between MSM8996 and MSM8998

[Rob Herring]

On Tue, 15 Nov 2022 13:53:08 +0100, Krzysztof Kozlowski wrote:
> MSM8996 and MSM8998 use the same clocks, so use one order to make the
> binding simpler.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
>  .../devicetree/bindings/pci/qcom,pcie.yaml    | 24 ++++++-------------
>  1 file changed, 7 insertions(+), 17 deletions(-)
> 

Acked-by: Rob Herring <robh@kernel.org>

Re: (subset) [PATCH 1/4] dt-bindings: PCI: qcom: add MSM8998 specific compatible

[Lorenzo Pieralisi]

On Tue, 15 Nov 2022 13:53:07 +0100, Krzysztof Kozlowski wrote:
> Add new compatible for MSM8998 (compatible with MSM8996) to allow
> further customizing if needed and to accurately describe the hardware.
> 
> 

Applied to pci/dt, thanks!

[1/4] dt-bindings: PCI: qcom: add MSM8998 specific compatible
      https://git.kernel.org/lpieralisi/pci/c/c427f45c1e99
[2/4] dt-bindings: PCI: qcom: unify clock order between MSM8996 and MSM8998
      https://git.kernel.org/lpieralisi/pci/c/3617fb0d8345

Thanks,
Lorenzo

Re: [PATCH 1/4] dt-bindings: PCI: qcom: add MSM8998 specific compatible

[Bjorn Helgaas]

On Tue, Nov 15, 2022 at 01:53:07PM +0100, Krzysztof Kozlowski wrote:
> Add new compatible for MSM8998 (compatible with MSM8996) to allow
> further customizing if needed and to accurately describe the hardware.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Hi Krzysztof,

Would you mind splitting this into two patches?

  - Convert "compatible:" from enum: to oneOf:
  - Add MSM8998

Having them combined makes the history a little bit harder to follow.

Bjorn

> ---
>  .../devicetree/bindings/pci/qcom,pcie.yaml    | 42 ++++++++++---------
>  1 file changed, 23 insertions(+), 19 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> index 54f07852d279..0411e2e67661 100644
> --- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
> @@ -16,25 +16,29 @@ description: |
>  
>  properties:
>    compatible:
> -    enum:
> -      - qcom,pcie-ipq8064
> -      - qcom,pcie-ipq8064-v2
> -      - qcom,pcie-apq8064
> -      - qcom,pcie-apq8084
> -      - qcom,pcie-msm8996
> -      - qcom,pcie-ipq4019
> -      - qcom,pcie-ipq8074
> -      - qcom,pcie-qcs404
> -      - qcom,pcie-sa8540p
> -      - qcom,pcie-sc7280
> -      - qcom,pcie-sc8180x
> -      - qcom,pcie-sc8280xp
> -      - qcom,pcie-sdm845
> -      - qcom,pcie-sm8150
> -      - qcom,pcie-sm8250
> -      - qcom,pcie-sm8450-pcie0
> -      - qcom,pcie-sm8450-pcie1
> -      - qcom,pcie-ipq6018
> +    oneOf:
> +      - enum:
> +          - qcom,pcie-ipq8064
> +          - qcom,pcie-ipq8064-v2
> +          - qcom,pcie-apq8064
> +          - qcom,pcie-apq8084
> +          - qcom,pcie-msm8996
> +          - qcom,pcie-ipq4019
> +          - qcom,pcie-ipq8074
> +          - qcom,pcie-qcs404
> +          - qcom,pcie-sa8540p
> +          - qcom,pcie-sc7280
> +          - qcom,pcie-sc8180x
> +          - qcom,pcie-sc8280xp
> +          - qcom,pcie-sdm845
> +          - qcom,pcie-sm8150
> +          - qcom,pcie-sm8250
> +          - qcom,pcie-sm8450-pcie0
> +          - qcom,pcie-sm8450-pcie1
> +          - qcom,pcie-ipq6018
> +      - items:
> +          - const: qcom,pcie-msm8998
> +          - const: qcom,pcie-msm8996
>  
>    reg:
>      minItems: 4
> -- 
> 2.34.1
> 

Re: [PATCH 1/4] dt-bindings: PCI: qcom: add MSM8998 specific compatible

[Krzysztof Kozlowski]

On 03/01/2023 21:39, Bjorn Helgaas wrote:
> On Tue, Nov 15, 2022 at 01:53:07PM +0100, Krzysztof Kozlowski wrote:
>> Add new compatible for MSM8998 (compatible with MSM8996) to allow
>> further customizing if needed and to accurately describe the hardware.
>>
>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> 
> Hi Krzysztof,
> 
> Would you mind splitting this into two patches?
> 
>   - Convert "compatible:" from enum: to oneOf:
>   - Add MSM8998
> 
> Having them combined makes the history a little bit harder to follow.
> 

Sure.


Best regards,
Krzysztof

Re: (subset) [PATCH 1/4] dt-bindings: PCI: qcom: add MSM8998 specific compatible

[Krzysztof Kozlowski]

On 30/12/2022 12:08, Lorenzo Pieralisi wrote:
> On Tue, 15 Nov 2022 13:53:07 +0100, Krzysztof Kozlowski wrote:
>> Add new compatible for MSM8998 (compatible with MSM8996) to allow
>> further customizing if needed and to accurately describe the hardware.
>>
>>
> 
> Applied to pci/dt, thanks!
> 
> [1/4] dt-bindings: PCI: qcom: add MSM8998 specific compatible
>       https://git.kernel.org/lpieralisi/pci/c/c427f45c1e99

Hi Lorenzo and Bjorn,

This commit was applied with a change:
[bhelgaas: sort msm8996 before msm8998]

This is a list ("items"), thus the order is important. Reversing order
broke it.

Please kindly do not amend the commits. If the commit is incorrect,
please bounce it and ask submitter (me in this case) to fix it. The same
when commit does not apply cleanly - submitter should resend after
rebasing the patch. There were already few mistakes introduced by
maintainers (not PCI, but others) when using git mergetool or some
Patchwork merge-something while applying.

https://lore.kernel.org/all/20230214091202.2187321-1-konrad.dybcio@linaro.org/

Best regards,
Krzysztof

Re: (subset) [PATCH 1/4] dt-bindings: PCI: qcom: add MSM8998 specific compatible

[Bjorn Helgaas]

On Tue, Feb 14, 2023 at 10:29:17AM +0100, Krzysztof Kozlowski wrote:
> On 30/12/2022 12:08, Lorenzo Pieralisi wrote:
> > On Tue, 15 Nov 2022 13:53:07 +0100, Krzysztof Kozlowski wrote:
> >> Add new compatible for MSM8998 (compatible with MSM8996) to allow
> >> further customizing if needed and to accurately describe the hardware.
> > 
> > Applied to pci/dt, thanks!
> > 
> > [1/4] dt-bindings: PCI: qcom: add MSM8998 specific compatible
> >       https://git.kernel.org/lpieralisi/pci/c/c427f45c1e99
> 
> Hi Lorenzo and Bjorn,
> 
> This commit was applied with a change:
> [bhelgaas: sort msm8996 before msm8998]
> 
> This is a list ("items"), thus the order is important. Reversing order
> broke it.

Sorry, I blew it.  It should be fixed now.

Bjorn