| Message ID | 20221115125310.184012-1-krzysztof.kozlowski@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [1/4] dt-bindings: PCI: qcom: add MSM8998 specific compatible | expand |
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>;
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>
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>
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
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 >
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
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
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(-)