Message ID | 20221214150605.173346-1-krzysztof.kozlowski@linaro.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp283704wrn; Wed, 14 Dec 2022 07:18:02 -0800 (PST) X-Google-Smtp-Source: AA0mqf7/4G6t6s5d06rSFlHpMfa6jgk5ngdAAPltolkSiWTSddUz/krzXtE5ZfGNx4uUF3af8wOK X-Received: by 2002:a05:6402:1f08:b0:467:f0e7:15f7 with SMTP id b8-20020a0564021f0800b00467f0e715f7mr20554035edb.31.1671031081983; Wed, 14 Dec 2022 07:18:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671031081; cv=none; d=google.com; s=arc-20160816; b=WtLkw09pZqhDUOPQlJGvAG1L+1KXPnPPk5i9Y9JMF1wz3VTRC5OERMRajoCmTEZB+b DJ2e6GxA+jNmmV25eA5nrafp4NOFsyuJJTngNGSvaZ6AknGtXdJZq6lMM67bx4mNtAgI 2dwspzOZr1pO1b3a8dopzOSVpC6DUYejxkdJNLU8ojtJqpfvPW93SYPa899LAO163s23 wdiPzHQOluqZYyyKoBPdvpJR2uOUcUNlkvtL1Pfp2RDlsnjoCnv9kJ53JtVzGj5nT0WG sKpYw9/cQ7TTi9CqaGiNJKMgqZhDPCGTr73RFAKZiHZdKW09i+2SdC7kDedGud31MqGL YbwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=m5UOweenssjuPFfHtO2azIhEx1ll4q21eV9Ps6cE+6E=; b=FC37KlXgJ0wMPvI4m41ld7ATmbQHng6QJattWilT3TE4XmAMbq74QeYNyJkTMbuFSY rR/egf3rtZ3OMgpVRJrABuMhjaM/96mTOuJ/fm+ZOb8rWyuKfiYtLshVnMBvPdgBb0RG TRBuMZFq2m6UrDw4pzE/1iEOvVPZOXnRGpcAwytUJnzGNefpOO/JB9PaGK5v5vPYTPzV pC0qWx+qM+c2SoSdEu1SyfSPal20XLfsZj4nW1OWlqjtCukfzT03y+bVYk7uNKf4F56m 4JDLW+ITRazISnKwgeUukzejdaci4DJGQMRDMyAe+0TeXAvbY8bDD/UBL3NtcMuQrCJ1 5Z6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=B2iZXPee; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n15-20020aa7db4f000000b0046fbd084ea6si7411019edt.142.2022.12.14.07.17.36; Wed, 14 Dec 2022 07:18:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=B2iZXPee; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238562AbiLNPGO (ORCPT <rfc822;jeantsuru.cumc.mandola@gmail.com> + 99 others); Wed, 14 Dec 2022 10:06:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237778AbiLNPGM (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 14 Dec 2022 10:06:12 -0500 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59E8C1147D for <linux-kernel@vger.kernel.org>; Wed, 14 Dec 2022 07:06:11 -0800 (PST) Received: by mail-lf1-x12f.google.com with SMTP id cf42so10962937lfb.1 for <linux-kernel@vger.kernel.org>; Wed, 14 Dec 2022 07:06:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=m5UOweenssjuPFfHtO2azIhEx1ll4q21eV9Ps6cE+6E=; b=B2iZXPeemy1Ie27I0eHgcj8azEuur6S70JuRqfCT+LUrn2ygMgvQ3YyCwvAgam3qfr GHX4Pgvfzqig+QVS7uC/NzyPNNRomEfp1B/1boDsy6oFVY/1tsJKkaBns2a/cNksuM4B tF1LPK+GnIvoeVPY3TB7X2zbOVW6mBZWfGyeUlctApaUWpfcErnNzT1f8OKD7e/gl0Q0 8SFAIkYA8VwFaIvmxzHtNXOIaBsUPrNyc/KztZdcFdSfG9oyQ9iCk1AT3LogkMsfxQan 4rUx/r6sgTXDnwjndcLWYDk9VkEBUTG3SOK60SqjHiW8xlE0LaUck6KMSUnM3/gDcqBI 3EaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=m5UOweenssjuPFfHtO2azIhEx1ll4q21eV9Ps6cE+6E=; b=J73ZmQOFrs/9ww2HjZu4Af9FHsYyoMcCsUxlnjrisSumyVCZWCw5J6wMM+4xCvAyoy Royezv0MElKlK1tDSqcfoM8kDVwjqNDN7ZPoc6tKkxJ4us7sK6tNxvZchGxdaXjYBgRg 7ySR1UbARQGJ+ywyfSvw8LafcRC7JwXO+KlHD8uNfhulY67VXSTrhifjCArL6ewerF7Q wSGgRyzzSR3nobpL/Km9i3b5WdzAAICLSCqlAZnfcrnsLVQ+7xA1p8SOaUKrdhjkbQ6f 6+ViwdQSFtamBAhgmhWWKYfXb2ZBLIp+vbnE3/kq72DkCSU5kJYSQrDfSxr+RI7SQsKh Abmg== X-Gm-Message-State: ANoB5pldBW2zUGn3bV8Vv6R1J42IKw70SRm4K1RGLMb2Oor6mgKXw6bl fI6I4ea9Hb+DqfIf1swBD8EULg== X-Received: by 2002:a05:6512:21ac:b0:4b5:785b:1caf with SMTP id c12-20020a05651221ac00b004b5785b1cafmr6307684lft.36.1671030369516; Wed, 14 Dec 2022 07:06:09 -0800 (PST) Received: from krzk-bin.NAT.warszawa.vectranet.pl (088156142067.dynamic-2-waw-k-3-2-0.vectranet.pl. [88.156.142.67]) by smtp.gmail.com with ESMTPSA id t19-20020a19dc13000000b004972b0bb426sm840107lfg.257.2022.12.14.07.06.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 07:06:08 -0800 (PST) From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> To: Andy Gross <agross@kernel.org>, Bjorn Andersson <andersson@kernel.org>, Konrad Dybcio <konrad.dybcio@linaro.org>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Subject: [PATCH] dt-bindings: arm: qcom: add board-id/msm-id for MSM8956, SDM636 and SM4250 Date: Wed, 14 Dec 2022 16:06:05 +0100 Message-Id: <20221214150605.173346-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752203087428408882?= X-GMAIL-MSGID: =?utf-8?q?1752203087428408882?= |
Series |
dt-bindings: arm: qcom: add board-id/msm-id for MSM8956, SDM636 and SM4250
|
|
Commit Message
Krzysztof Kozlowski
Dec. 14, 2022, 3:06 p.m. UTC
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>
---
Documentation/devicetree/bindings/arm/qcom.yaml | 5 +++++
1 file changed, 5 insertions(+)
Comments
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? [1]: https://lore.kernel.org/linux-arm-msm/20221111120156.48040-9-angelogioacchino.delregno@collabora.com/ > - 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. - Marijn > - qcom,sm6125 > - qcom,sm6350 > - qcom,sm7225 > @@ -957,6 +960,8 @@ allOf: > - oneplus,dumpling > - oneplus,enchilada > - oneplus,fajita > + - oneplus,oneplus3 > + - oneplus,oneplus3t > then: > properties: > qcom,board-id: > -- > 2.34.1 >
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. 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
On 2022-12-14 17:45:49, 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. That is quite unfortunate, and it had me puzzled for a second... > >> - 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. Correct, it's still in progress before being uptreamed. Given that Konrad already has patches to add the names here when he does, it makes sense to leave this. - Marijn
On Wed, 14 Dec 2022 16:06:05 +0100, 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> > --- > Documentation/devicetree/bindings/arm/qcom.yaml | 5 +++++ > 1 file changed, 5 insertions(+) > Acked-by: Rob Herring <robh@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 >
On Wed, 14 Dec 2022 16:06:05 +0100, 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. > > Applied, thanks! [1/1] dt-bindings: arm: qcom: add board-id/msm-id for MSM8956, SDM636 and SM4250 commit: 47c6315ea64de35aaa738e8d647a4359ede202e8 Best regards,
On 11/01/2023 05:30, Bjorn Andersson wrote: > 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. I vote for this (unless for really trivial cases). The submitter should know better how to resolve the conflict (through rebase) than you. Best regards, Krzysztof
On 2023-01-10 22:30:00, Bjorn Andersson wrote: > 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. Is this manual conflict resolution by you? Git would/should only make it disappear if it thinks that (part of) the patch has already been applied, though I don't think those lines were added with the exact same indentation elsewhere in the file. There's also a mode that makes git reject the patch if the context (and line numbers?) doesn't match up exactly, but that may cause more harm than good. - Marijn
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 - qcom,msm8992 - qcom,msm8994 - qcom,msm8996 - qcom,msm8998 - qcom,sdm630 - qcom,sdm632 + - qcom,sdm636 - qcom,sdm845 - qcom,sdx55 - qcom,sdx65 + - qcom,sm4250 - qcom,sm6125 - qcom,sm6350 - qcom,sm7225 @@ -957,6 +960,8 @@ allOf: - oneplus,dumpling - oneplus,enchilada - oneplus,fajita + - oneplus,oneplus3 + - oneplus,oneplus3t then: properties: qcom,board-id: