| Message ID | 20221115125310.184012-1-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Lorenzo Pieralisi |
| Headers | show |
| Series | [1/4] dt-bindings: PCI: qcom: add MSM8998 specific compatible | expand |
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,
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: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
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
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
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(-)