Re: [PATCH v2] dt-bindings: hwmon: tmp102: Document TMP113

[Marek Vasut <marex@nabladev.com>]

On 9/1/26 7:48 PM, Guenter Roeck wrote:

Hello Guenter,

>>> @@ -13,11 +13,12 @@ properties:
>>>     compatible:
>>>       oneOf:
>>>         - items:
>>> +          - enum:
>>> +              - ti,tmp110
>>> +              - ti,tmp113
>>>             - const: ti,tmp102
>>> -          - const: ti,tmp103
>>> -          - const: ti,tmp110
>>> -      - enum:
>>> -          - ti,tmp102
>>> +      - const: ti,tmp102
>>> +      - const: ti,tmp103
>>
>> Should this not be two patches, one fixing the existing stuff and one
>> adding the 113?
>>
> 
> It is all in -next. Looks like I resolved the conflict when combining
> "dt-bindings: hwmon: tmp102: move ti,tmp103 out of trivial-devices.yaml"
> and "dt-bindings: hwmon: tmp102: Document TMP110" the wrong way.
> Sorry for that.

No worries, I hope V3 I just sent fixes it up.

> Instead of adding more patches on top of it, how about providing a
> single patch moving tmp103 and adding tmp110 as well as tmp113
> together ? Alternatively, I could drop "dt-bindings: hwmon: tmp102:
> Document TMP110", apply the original (non-conflicting version) of
> "dt-bindings: hwmon: tmp102: move ti,tmp103 out of trivial-devices.yaml",
> and then tmp110 and tmp113 could be added in a single patch.
> 
> Please let me know.
I think the broken commit is d67ec24d3f07 ("dt-bindings: hwmon: tmp102: 
move ti,tmp103 out of trivial-devices.yaml") and v3 1/2 is the fix for 
that broken commit. V3 2/2 only adds the missing TMP113 .

So I think there are two options:
- The complicated one -- squash d67ec24d3f07 ("dt-bindings: hwmon: 
tmp102: move ti,tmp103 out of trivial-devices.yaml") and V3 1/2 (and 
either do it in tree, or drop d67ec24d3f07 ("dt-bindings: hwmon: tmp102: 
move ti,tmp103 out of trivial-devices.yaml") and ask for it to be 
updated and resent), then apply that, and apply V3 2/2 (or newer) .
- The simple one -- apply both V3 patches (or whatever newer version is 
good enough) and move on.

Just let me know what you like better.