Re: [PATCH] dt-bindings: arm: qcom: add board-id/msm-id for MSM8956, SDM636 and SM4250

[Bjorn Andersson <andersson@kernel.org>]

On Wed, Dec 14, 2022 at 05:45:49PM +0100, Krzysztof Kozlowski wrote:
> On 14/12/2022 16:29, Marijn Suijten wrote:
> > On 2022-12-14 16:06:05, Krzysztof Kozlowski wrote:
> >> Allow qcom,board-id and qcom,msm-id leagcy properties on these older
> >> platforms: MSM8956, SDM636 and SM4250.  Also mention more OnePlus
> >> devices using modified qcom,board-id field.
> >>
> >> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> > 
> > Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org>
> > 
> >> ---
> >>  Documentation/devicetree/bindings/arm/qcom.yaml | 5 +++++
> >>  1 file changed, 5 insertions(+)
> >>
> >> diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml
> >> index d45e2129fce3..cfb7f5caf606 100644
> >> --- a/Documentation/devicetree/bindings/arm/qcom.yaml
> >> +++ b/Documentation/devicetree/bindings/arm/qcom.yaml
> >> @@ -925,15 +925,18 @@ allOf:
> >>                - qcom,apq8026
> >>                - qcom,apq8094
> >>                - qcom,apq8096
> >> +              - qcom,msm8956
> > 
> > I am certain this (and msm8976) were added in [1] but it somehow got
> > lost when that was merged as 05c0c38dc752 ("dt-bindings: arm: qcom:
> > Document msm8956 and msm8976 SoC and devices")?
> > 
> > Should we also add qcom,msm8976 or only when a user for that board is
> > added?
> 
> Bjorn,
> You need to fix your scripts. It's not the first time when applied patch
> is changed and its pieces are gone.
> 

I don't have any script that automagically solves merge conflicts, so if
you prefer to avoid the occasional mistake I can start reject your
patches as soon as they don't apply 100% cleanly.

Regards,
Bjorn

> This is patchwork:
> https://patchwork.kernel.org/project/linux-arm-msm/patch/20221111120156.48040-9-angelogioacchino.delregno@collabora.com/
> 
> This is git:
> https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git/commit/?h=arm64-for-6.2&id=05c0c38dc752eb9244e53d72ce1030f36153daf8
> 
> Two different patches.
> 
> 
> > 
> >>                - qcom,msm8992
> >>                - qcom,msm8994
> >>                - qcom,msm8996
> >>                - qcom,msm8998
> >>                - qcom,sdm630
> >>                - qcom,sdm632
> >> +              - qcom,sdm636
> >>                - qcom,sdm845
> >>                - qcom,sdx55
> >>                - qcom,sdx65
> >> +              - qcom,sm4250
> > 
> > qcom,sm6115 could be added as well unless you rather leave that to the
> > person(s) adding the board compatible later on.
> 
> There is no board, I think, so I did not add compatible.
> 
> Best regards,
> Krzysztof
>