| Message ID | 20221117121307.264550-1-krzysztof.kozlowski@linaro.org |
|---|---|
| State | Accepted |
| Commit | 51f7be212ae6c9c09e77d17468fe26485f79836d |
| Headers | show |
| Series | dt-bindings: iio: adc: qcom,spmi-vadc: fix PM8350 define | expand |
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>; };
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(-)