Message ID | 20221117121307.264550-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:f944:0:0:0:0:0 with SMTP id q4csp369538wrr; Thu, 17 Nov 2022 04:26:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf4wXqke36L+VzJoYpi1xJrYD6H6CI7Lq4d7etuCAjppet8d1sR8ZYrFlJyH6W9SgNCeTWcF X-Received: by 2002:a62:6445:0:b0:56c:3a0e:cf13 with SMTP id y66-20020a626445000000b0056c3a0ecf13mr2767864pfb.29.1668688000521; Thu, 17 Nov 2022 04:26:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668688000; cv=none; d=google.com; s=arc-20160816; b=O1f4xegIdPHCJ5M+T3/lOR2GR9+7MHR8NN+y5Ww9fbFB+L75sX2qHmE8pNWkQ5vq2b 3iZCX61iwlYqX2Te9IZeSuL3CpKlACI7YyfBk+3qo8fbHbS3T3BSRijCxwIne/FR9ybb RO1XM2MOxN5cYzy4w8vDAUv5MYnsLslGSPYgJAKwXSzoUHmRt8/snmmD0z5ZzYpQ+cBM 3wwPaRX63kirkKBNkIDILrjJgd4Jjxak0YYwGg9jlwcqaSENGGPCqr2I2uApZxDV3eCk q/z9XrvTkRFlOcxk/RCuPAxh3GN11CrznkDCdyqQcAX4BOBCBvXhAI44oc5jKhtExTj4 nNWQ== 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=QovtdL7BP1h09phxGHQZDMWqvkgGdhA6FAPrdwAQwIY=; b=xI4i/RrrB7fGZNPyaPIRiiRqWd0nem3UH5Q2pdzv+shjrKYDjV/ZkhxmwDaiEhz84i /QcYPf04+iUVsy0g2T667ESAJh3FIeo1BhkOZ/MVhHfxmuiXm2K2Xkt2/sEv0U/PNLUT B14vr385yR788aSCYOM/mOcfATLGNpTMNNuRdSEW8iXxi5hEtkuUgRrQs4Xw4kDwiQAg J89rgCI6ppmpAfGQ3KAGqrruqicQRITDWM8er8Zpc2Vm9YupToCG6/LhcpfFB6T2Dl1t k7JjaX0WzZ2sjHdMnzUt5e05VYYkSZIS4jGa3L8BYZuMxIJe1297CAKAf2gCLwO8xk4w VKBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=msBzi3o4; 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 iw20-20020a170903045400b00175430821b1si727754plb.430.2022.11.17.04.26.27; Thu, 17 Nov 2022 04:26:40 -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=msBzi3o4; 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 S240029AbiKQMNQ (ORCPT <rfc822;a1648639935@gmail.com> + 99 others); Thu, 17 Nov 2022 07:13:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240027AbiKQMNO (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 17 Nov 2022 07:13:14 -0500 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD6F147330 for <linux-kernel@vger.kernel.org>; Thu, 17 Nov 2022 04:13:13 -0800 (PST) Received: by mail-lf1-x131.google.com with SMTP id g7so2483267lfv.5 for <linux-kernel@vger.kernel.org>; Thu, 17 Nov 2022 04:13:13 -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=QovtdL7BP1h09phxGHQZDMWqvkgGdhA6FAPrdwAQwIY=; b=msBzi3o4FOprNhhufGIQzsDbSw190/zGjGEJk2af23OoiteXJOMOvsx43btiImNDz0 FFkO+fjtQcqthSEbuA9ORWG2S/QTGGYyuXKWSBpt1ZfyH0AyuwdYRGVCXYy7hKqMHivF eSp0/k7ltt1i7aC3GSuUef0V93qTFgPACXKiiOVTC0tX7LcgU9rOYk0tD9wRAsh0+Ge9 FUVr1qLpjAw9B1usqq7ZYO/eVUh5F4MUTTbVahTLZcesgpoE1WmNLDQZlgKog3F/0r+C GM212jEORbn34mrlVtS4xOkeo9B1ffUi7Ye3TJo0/y8K4FUne6NFlH620YyufBRmQmj/ 5cQw== 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=QovtdL7BP1h09phxGHQZDMWqvkgGdhA6FAPrdwAQwIY=; b=tzkGlzWLsl/GTiAWpvjT+axd38U8V3feF+KMUIeY+YrWIJxMa587C9Ay1s593OoDds 9U2m3KNrqHqhq09OifakLfrJcVlfSpKg7tFZNmKjv+/PoX93/8X/guQLjPfnEvBnmmN3 wg75ciHbAHkWxBBXpP+YxV95DSzb5S/vu8o6nw44nTMD6+wJxkAUVN7GDbCCAIexbvlR yK/ea/5DMpp+G41XeK1lFcXjzwEcruzBVAaKlNSUum1XwU9VuqZ/dV7GV+1ScyIH0dbS U/8Cq928GyVbBA1qB27aMuwtp/EA91CxWy4be6BUGzvyvsYixrtF2pZu1gnfB+78afRH JIvg== X-Gm-Message-State: ANoB5plgz2ooq7n5BTHNnjzIU7MqYCqvV7kZqkXIDvFu0DeKzROU5kUi eDLzRWO4xSQieDJycuBYUhSVpw== X-Received: by 2002:a05:6512:3b88:b0:4a3:9533:f4c9 with SMTP id g8-20020a0565123b8800b004a39533f4c9mr836327lfv.615.1668687192074; Thu, 17 Nov 2022 04:13:12 -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 x12-20020a19f60c000000b0048b26d4bb64sm125133lfe.40.2022.11.17.04.13.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 04:13:11 -0800 (PST) From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> To: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>, Bjorn Andersson <andersson@kernel.org>, Jonathan Cameron <jic23@kernel.org>, Lars-Peter Clausen <lars@metafoo.de>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Andy Gross <agross@kernel.org>, linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Subject: [PATCH] dt-bindings: iio: adc: qcom,spmi-vadc: fix PM8350 define Date: Thu, 17 Nov 2022 13:13:07 +0100 Message-Id: <20221117121307.264550-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?1749746189019594426?= X-GMAIL-MSGID: =?utf-8?q?1749746189019594426?= |
Series |
dt-bindings: iio: adc: qcom,spmi-vadc: fix PM8350 define
|
|
Commit Message
Krzysztof Kozlowski
Nov. 17, 2022, 12:13 p.m. UTC
The defines from include/dt-bindings/iio/qcom,spmi-adc7-pm8350.h were
changed to take sid argument:
Error: Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.example.dts:99.28-29 syntax error
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
Issue is caused by commit 22f1d06f4f28 ("dt-bindings: iio: qcom:
adc7-pm8350: Allow specifying SID for channels") from Bjorn's tree.
Unfortunately get_maintainers.pl were not used, so IIO maintaners were
not CCed.
---
Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On Thu, Nov 17, 2022 at 01:13:07PM +0100, Krzysztof Kozlowski wrote: > The defines from include/dt-bindings/iio/qcom,spmi-adc7-pm8350.h were > changed to take sid argument: > > Error: Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.example.dts:99.28-29 syntax error > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Looks like I didn't rebase on top of Bjorn's for-next for my series, so didn't see this example. Thanks for fixing! Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Thanks, Mani > > --- > > Issue is caused by commit 22f1d06f4f28 ("dt-bindings: iio: qcom: > adc7-pm8350: Allow specifying SID for channels") from Bjorn's tree. > > Unfortunately get_maintainers.pl were not used, so IIO maintaners were > not CCed. > --- > Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml b/Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml > index f1522196042d..bd6e0d6f6e0c 100644 > --- a/Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml > +++ b/Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml > @@ -299,7 +299,7 @@ examples: > }; > > conn-therm@47 { > - reg = <PM8350_ADC7_AMUX_THM4_100K_PU>; > + reg = <PM8350_ADC7_AMUX_THM4_100K_PU(1)>; > qcom,ratiometric; > qcom,hw-settle-time = <200>; > }; > -- > 2.34.1 >
On 17/11/2022 13:22, Manivannan Sadhasivam wrote: > On Thu, Nov 17, 2022 at 01:13:07PM +0100, Krzysztof Kozlowski wrote: >> The defines from include/dt-bindings/iio/qcom,spmi-adc7-pm8350.h were >> changed to take sid argument: >> >> Error: Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.example.dts:99.28-29 syntax error >> >> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > Looks like I didn't rebase on top of Bjorn's for-next for my series, so didn't > see this example. > > Thanks for fixing! > > Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > This should not go via Bjorn's tree without IIO ack and Jonathan/Lars-Peter/IIO lists were not in CC. Best regards, Krzysztof
On Thu, 17 Nov 2022 13:28:33 +0100 Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: > On 17/11/2022 13:22, Manivannan Sadhasivam wrote: > > On Thu, Nov 17, 2022 at 01:13:07PM +0100, Krzysztof Kozlowski wrote: > >> The defines from include/dt-bindings/iio/qcom,spmi-adc7-pm8350.h were > >> changed to take sid argument: > >> > >> Error: Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.example.dts:99.28-29 syntax error > >> > >> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > > > Looks like I didn't rebase on top of Bjorn's for-next for my series, so didn't > > see this example. > > > > Thanks for fixing! > > > > Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > > > > This should not go via Bjorn's tree without IIO ack and > Jonathan/Lars-Peter/IIO lists were not in CC. > Thanks for the heads up. Not sure I'd have registered there would have been a problem here even if I had seen original patch. Anyhow, I assume Bjorn will pick this up and all will be well again. Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Best regards, > Krzysztof >
On 17/11/2022 16:56, Jonathan Cameron wrote: > On Thu, 17 Nov 2022 13:28:33 +0100 > Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: > >> On 17/11/2022 13:22, Manivannan Sadhasivam wrote: >>> On Thu, Nov 17, 2022 at 01:13:07PM +0100, Krzysztof Kozlowski wrote: >>>> The defines from include/dt-bindings/iio/qcom,spmi-adc7-pm8350.h were >>>> changed to take sid argument: >>>> >>>> Error: Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.example.dts:99.28-29 syntax error >>>> >>>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >>> >>> Looks like I didn't rebase on top of Bjorn's for-next for my series, so didn't >>> see this example. >>> >>> Thanks for fixing! >>> >>> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> >>> >> >> This should not go via Bjorn's tree without IIO ack and >> Jonathan/Lars-Peter/IIO lists were not in CC. >> > Thanks for the heads up. > > Not sure I'd have registered there would have been a problem here even > if I had seen original patch. Anyhow, I assume Bjorn will pick this up > and all will be well again. > > Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> I am afraid it cannot go via Bjorn's tree, because this depends on a change in your tree: https://lore.kernel.org/all/20221027143411.277980-2-krzysztof.kozlowski@linaro.org/ Can you pick it up instead? This is the only way to fix the linux-next, although your tree will have a dt_binding_check error. Other way is to have cross-tree merge, but the commit to bindings headers ended up in DTS patch, so it cannot be shared with driver tree. Best regards, Krzysztof
On Thu, 17 Nov 2022 17:21:25 +0100 Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: > On 17/11/2022 16:56, Jonathan Cameron wrote: > > On Thu, 17 Nov 2022 13:28:33 +0100 > > Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: > > > >> On 17/11/2022 13:22, Manivannan Sadhasivam wrote: > >>> On Thu, Nov 17, 2022 at 01:13:07PM +0100, Krzysztof Kozlowski wrote: > >>>> The defines from include/dt-bindings/iio/qcom,spmi-adc7-pm8350.h were > >>>> changed to take sid argument: > >>>> > >>>> Error: Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.example.dts:99.28-29 syntax error > >>>> > >>>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > >>> > >>> Looks like I didn't rebase on top of Bjorn's for-next for my series, so didn't > >>> see this example. > >>> > >>> Thanks for fixing! > >>> > >>> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > >>> > >> > >> This should not go via Bjorn's tree without IIO ack and > >> Jonathan/Lars-Peter/IIO lists were not in CC. > >> > > Thanks for the heads up. > > > > Not sure I'd have registered there would have been a problem here even > > if I had seen original patch. Anyhow, I assume Bjorn will pick this up > > and all will be well again. > > > > Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > I am afraid it cannot go via Bjorn's tree, because this depends on a > change in your tree: > https://lore.kernel.org/all/20221027143411.277980-2-krzysztof.kozlowski@linaro.org/ > > Can you pick it up instead? This is the only way to fix the linux-next, > although your tree will have a dt_binding_check error. > > Other way is to have cross-tree merge, but the commit to bindings > headers ended up in DTS patch, so it cannot be shared with driver tree. Ah. I've sent Greg a pull reuqest including that patch, so this is going to get worse and the linux-next intermediate builds are going to fail which is never good. Best bet at this point may be for Bjorn to also take the dependency you list above and the fix. Git will happily unwind the same patch turning up in two trees and that way he'll have everything and the IIO tree + char-misc will be fine on their own as well. That work for everyone? Jonathan > > Best regards, > Krzysztof >
On 17/11/2022 17:58, Jonathan Cameron wrote: > On Thu, 17 Nov 2022 17:21:25 +0100 > Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: > >> On 17/11/2022 16:56, Jonathan Cameron wrote: >>> On Thu, 17 Nov 2022 13:28:33 +0100 >>> Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: >>> >>>> On 17/11/2022 13:22, Manivannan Sadhasivam wrote: >>>>> On Thu, Nov 17, 2022 at 01:13:07PM +0100, Krzysztof Kozlowski wrote: >>>>>> The defines from include/dt-bindings/iio/qcom,spmi-adc7-pm8350.h were >>>>>> changed to take sid argument: >>>>>> >>>>>> Error: Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.example.dts:99.28-29 syntax error >>>>>> >>>>>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >>>>> >>>>> Looks like I didn't rebase on top of Bjorn's for-next for my series, so didn't >>>>> see this example. >>>>> >>>>> Thanks for fixing! >>>>> >>>>> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> >>>>> >>>> >>>> This should not go via Bjorn's tree without IIO ack and >>>> Jonathan/Lars-Peter/IIO lists were not in CC. >>>> >>> Thanks for the heads up. >>> >>> Not sure I'd have registered there would have been a problem here even >>> if I had seen original patch. Anyhow, I assume Bjorn will pick this up >>> and all will be well again. >>> >>> Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> >> >> I am afraid it cannot go via Bjorn's tree, because this depends on a >> change in your tree: >> https://lore.kernel.org/all/20221027143411.277980-2-krzysztof.kozlowski@linaro.org/ >> >> Can you pick it up instead? This is the only way to fix the linux-next, >> although your tree will have a dt_binding_check error. >> >> Other way is to have cross-tree merge, but the commit to bindings >> headers ended up in DTS patch, so it cannot be shared with driver tree. > > Ah. I've sent Greg a pull reuqest including that patch, so this is going to get > worse and the linux-next intermediate builds are going to fail which is never good. > > Best bet at this point may be for Bjorn to also take the dependency > you list above and the fix. > > Git will happily unwind the same patch turning up in two trees and > that way he'll have everything and the IIO tree + char-misc will > be fine on their own as well. > > That work for everyone? Yes, that's also good solution. You only need this one commit: 22f1d06f4f283e36622036726093032a07d67c0d https://lore.kernel.org/all/20221103095810.64606-2-manivannan.sadhasivam@linaro.org/ Best regards, Krzysztof
On Thu, Nov 17, 2022 at 10:58 AM Jonathan Cameron <Jonathan.Cameron@huawei.com> wrote: > > On Thu, 17 Nov 2022 17:21:25 +0100 > Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: > > > On 17/11/2022 16:56, Jonathan Cameron wrote: > > > On Thu, 17 Nov 2022 13:28:33 +0100 > > > Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: > > > > > >> On 17/11/2022 13:22, Manivannan Sadhasivam wrote: > > >>> On Thu, Nov 17, 2022 at 01:13:07PM +0100, Krzysztof Kozlowski wrote: > > >>>> The defines from include/dt-bindings/iio/qcom,spmi-adc7-pm8350.h were > > >>>> changed to take sid argument: > > >>>> > > >>>> Error: Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.example.dts:99.28-29 syntax error > > >>>> > > >>>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > >>> > > >>> Looks like I didn't rebase on top of Bjorn's for-next for my series, so didn't > > >>> see this example. > > >>> > > >>> Thanks for fixing! > > >>> > > >>> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > > >>> > > >> > > >> This should not go via Bjorn's tree without IIO ack and > > >> Jonathan/Lars-Peter/IIO lists were not in CC. > > >> > > > Thanks for the heads up. > > > > > > Not sure I'd have registered there would have been a problem here even > > > if I had seen original patch. Anyhow, I assume Bjorn will pick this up > > > and all will be well again. > > > > > > Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > > > I am afraid it cannot go via Bjorn's tree, because this depends on a > > change in your tree: > > https://lore.kernel.org/all/20221027143411.277980-2-krzysztof.kozlowski@linaro.org/ > > > > Can you pick it up instead? This is the only way to fix the linux-next, > > although your tree will have a dt_binding_check error. > > > > Other way is to have cross-tree merge, but the commit to bindings > > headers ended up in DTS patch, so it cannot be shared with driver tree. > > Ah. I've sent Greg a pull reuqest including that patch, so this is going to get > worse and the linux-next intermediate builds are going to fail which is never good. > > Best bet at this point may be for Bjorn to also take the dependency > you list above and the fix. > > Git will happily unwind the same patch turning up in two trees and > that way he'll have everything and the IIO tree + char-misc will > be fine on their own as well. > > That work for everyone? linux-next is failing still. Is someone going to sort this out? Rob
On Mon, Dec 05, 2022 at 05:36:12PM -0600, Rob Herring wrote: > On Thu, Nov 17, 2022 at 10:58 AM Jonathan Cameron > <Jonathan.Cameron@huawei.com> wrote: > > > > On Thu, 17 Nov 2022 17:21:25 +0100 > > Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: > > > > > On 17/11/2022 16:56, Jonathan Cameron wrote: > > > > On Thu, 17 Nov 2022 13:28:33 +0100 > > > > Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: > > > > > > > >> On 17/11/2022 13:22, Manivannan Sadhasivam wrote: > > > >>> On Thu, Nov 17, 2022 at 01:13:07PM +0100, Krzysztof Kozlowski wrote: > > > >>>> The defines from include/dt-bindings/iio/qcom,spmi-adc7-pm8350.h were > > > >>>> changed to take sid argument: > > > >>>> > > > >>>> Error: Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.example.dts:99.28-29 syntax error > > > >>>> > > > >>>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > > >>> > > > >>> Looks like I didn't rebase on top of Bjorn's for-next for my series, so didn't > > > >>> see this example. > > > >>> > > > >>> Thanks for fixing! > > > >>> > > > >>> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > > > >>> > > > >> > > > >> This should not go via Bjorn's tree without IIO ack and > > > >> Jonathan/Lars-Peter/IIO lists were not in CC. > > > >> > > > > Thanks for the heads up. > > > > > > > > Not sure I'd have registered there would have been a problem here even > > > > if I had seen original patch. Anyhow, I assume Bjorn will pick this up > > > > and all will be well again. > > > > > > > > Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > > > > > I am afraid it cannot go via Bjorn's tree, because this depends on a > > > change in your tree: > > > https://lore.kernel.org/all/20221027143411.277980-2-krzysztof.kozlowski@linaro.org/ > > > > > > Can you pick it up instead? This is the only way to fix the linux-next, > > > although your tree will have a dt_binding_check error. > > > > > > Other way is to have cross-tree merge, but the commit to bindings > > > headers ended up in DTS patch, so it cannot be shared with driver tree. > > > > Ah. I've sent Greg a pull reuqest including that patch, so this is going to get > > worse and the linux-next intermediate builds are going to fail which is never good. > > > > Best bet at this point may be for Bjorn to also take the dependency > > you list above and the fix. > > > > Git will happily unwind the same patch turning up in two trees and > > that way he'll have everything and the IIO tree + char-misc will > > be fine on their own as well. > > > > That work for everyone? > > linux-next is failing still. Is someone going to sort this out? > I've picked up the dependency followed by Krzysztof's patch, and notified Stephen about the expected merge conflict between our trees. The result do pass dt_binding_check of this binding. Regards, Bjorn
On Thu, 17 Nov 2022 13:13:07 +0100, Krzysztof Kozlowski wrote: > The defines from include/dt-bindings/iio/qcom,spmi-adc7-pm8350.h were > changed to take sid argument: > > Error: Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.example.dts:99.28-29 syntax error > > Applied, thanks! [1/1] dt-bindings: iio: adc: qcom,spmi-vadc: fix PM8350 define commit: 51f7be212ae6c9c09e77d17468fe26485f79836d Best regards,
diff --git a/Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml b/Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml index f1522196042d..bd6e0d6f6e0c 100644 --- a/Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml +++ b/Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml @@ -299,7 +299,7 @@ examples: }; conn-therm@47 { - reg = <PM8350_ADC7_AMUX_THM4_100K_PU>; + reg = <PM8350_ADC7_AMUX_THM4_100K_PU(1)>; qcom,ratiometric; qcom,hw-settle-time = <200>; };