From: Marek Vasut <marex@nabladev.com>
To: Guenter Roeck <linux@roeck-us.net>, Conor Dooley <conor@kernel.org>
Cc: linux-pm@vger.kernel.org, Conor Dooley <conor+dt@kernel.org>,
Flaviu Nistor <flaviu.nistor@gmail.com>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Rob Herring <robh@kernel.org>,
devicetree@vger.kernel.org, linux-hwmon@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] dt-bindings: hwmon: tmp102: Document TMP113
Date: Tue, 1 Sep 2026 19:58:51 +0200 [thread overview]
Message-ID: <2e3f7dab-5f64-4dcf-b995-82fcc3a5e780@nabladev.com> (raw)
In-Reply-To: <4bbcc5fe-86a1-4299-a0df-e9f44d5c237f@roeck-us.net>
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.
next prev parent reply other threads:[~2026-09-01 17:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-01 16:09 [PATCH v2] dt-bindings: hwmon: tmp102: Document TMP113 Marek Vasut
2026-09-01 16:14 ` sashiko-bot
2026-09-01 17:37 ` Conor Dooley
2026-09-01 17:47 ` Marek Vasut
2026-09-01 17:48 ` Guenter Roeck
2026-09-01 17:58 ` Marek Vasut [this message]
2026-09-01 18:04 ` Conor Dooley
2026-09-01 18:16 ` Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2e3f7dab-5f64-4dcf-b995-82fcc3a5e780@nabladev.com \
--to=marex@nabladev.com \
--cc=conor+dt@kernel.org \
--cc=conor@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=flaviu.nistor@gmail.com \
--cc=krzk+dt@kernel.org \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.