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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
>
> 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 <[email protected]>
>
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 <[email protected]> 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 <[email protected]>
> >
> > 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 <[email protected]>
> >
>
> 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 <[email protected]>
> Best regards,
> Krzysztof
>
On 17/11/2022 16:56, Jonathan Cameron wrote:
> On Thu, 17 Nov 2022 13:28:33 +0100
> Krzysztof Kozlowski <[email protected]> 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 <[email protected]>
>>>
>>> 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 <[email protected]>
>>>
>>
>> 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 <[email protected]>
I am afraid it cannot go via Bjorn's tree, because this depends on a
change in your tree:
https://lore.kernel.org/all/[email protected]/
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 <[email protected]> wrote:
> On 17/11/2022 16:56, Jonathan Cameron wrote:
> > On Thu, 17 Nov 2022 13:28:33 +0100
> > Krzysztof Kozlowski <[email protected]> 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 <[email protected]>
> >>>
> >>> 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 <[email protected]>
> >>>
> >>
> >> 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 <[email protected]>
>
> I am afraid it cannot go via Bjorn's tree, because this depends on a
> change in your tree:
> https://lore.kernel.org/all/[email protected]/
>
> 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 <[email protected]> wrote:
>
>> On 17/11/2022 16:56, Jonathan Cameron wrote:
>>> On Thu, 17 Nov 2022 13:28:33 +0100
>>> Krzysztof Kozlowski <[email protected]> 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 <[email protected]>
>>>>>
>>>>> 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 <[email protected]>
>>>>>
>>>>
>>>> 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 <[email protected]>
>>
>> I am afraid it cannot go via Bjorn's tree, because this depends on a
>> change in your tree:
>> https://lore.kernel.org/all/[email protected]/
>>
>> 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/[email protected]/
Best regards,
Krzysztof
On Thu, Nov 17, 2022 at 10:58 AM Jonathan Cameron
<[email protected]> wrote:
>
> On Thu, 17 Nov 2022 17:21:25 +0100
> Krzysztof Kozlowski <[email protected]> wrote:
>
> > On 17/11/2022 16:56, Jonathan Cameron wrote:
> > > On Thu, 17 Nov 2022 13:28:33 +0100
> > > Krzysztof Kozlowski <[email protected]> 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 <[email protected]>
> > >>>
> > >>> 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 <[email protected]>
> > >>>
> > >>
> > >> 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 <[email protected]>
> >
> > I am afraid it cannot go via Bjorn's tree, because this depends on a
> > change in your tree:
> > https://lore.kernel.org/all/[email protected]/
> >
> > 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
> <[email protected]> wrote:
> >
> > On Thu, 17 Nov 2022 17:21:25 +0100
> > Krzysztof Kozlowski <[email protected]> wrote:
> >
> > > On 17/11/2022 16:56, Jonathan Cameron wrote:
> > > > On Thu, 17 Nov 2022 13:28:33 +0100
> > > > Krzysztof Kozlowski <[email protected]> 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 <[email protected]>
> > > >>>
> > > >>> 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 <[email protected]>
> > > >>>
> > > >>
> > > >> 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 <[email protected]>
> > >
> > > I am afraid it cannot go via Bjorn's tree, because this depends on a
> > > change in your tree:
> > > https://lore.kernel.org/all/[email protected]/
> > >
> > > 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