.../bindings/firmware/google,gs101-acpm-ipc.yaml | 54 +- .../bindings/mfd/samsung,s2mpg10-pmic.yaml | 120 ++ .../bindings/mfd/samsung,s2mpg11-pmic.yaml | 88 ++ .../devicetree/bindings/mfd/samsung,s2mps11.yaml | 29 +- .../regulator/samsung,s2mpg10-regulator.yaml | 158 +++ .../regulator/samsung,s2mpg11-regulator.yaml | 136 +++ MAINTAINERS | 1 + drivers/mfd/sec-acpm.c | 171 ++- drivers/mfd/sec-common.c | 17 +- drivers/mfd/sec-irq.c | 85 +- drivers/regulator/s2mps11.c | 1186 ++++++++++++++++++-- .../regulator/samsung,s2mpg10-regulator.h | 53 + include/linux/mfd/samsung/core.h | 1 + include/linux/mfd/samsung/irq.h | 105 ++ include/linux/mfd/samsung/s2mpg10.h | 44 +- include/linux/mfd/samsung/s2mpg11.h | 434 +++++++ include/linux/regulator/driver.h | 5 + 17 files changed, 2526 insertions(+), 161 deletions(-)
This series extends the existing S2MPG10 PMIC driver to add support for
the regulators, and adds new S2MPG11 core and regulator drivers.
--- dependency note ---
This series must be applied in-order, due to the regulator drivers
depending on headers & definitions added by the bindings and core
drivers. I would expect them all to go via the MFD tree.
The MFD patches in this series also depend on my Samsung MFD patches
due to patch context:
https://lore.kernel.org/all/20251217-s5m-alarm-v2-0-b7bff003e94c@linaro.org/
While these patches compile, regulator probe will only be successful
with my deferrable regulators patches from
https://lore.kernel.org/r/20251227-regulators-defer-v1-0-3104b22d84cb@linaro.org
--- end ---
The patches are kept together in one series, due to S2MPG11 and its
regulators being very similar to S2MPG10.
The Samsung S2MPG11 PMIC is a Power Management IC for mobile
applications with buck converters, various LDOs, power meters, and
additional GPIO interfaces. It typically complements an S2MPG10 PMIC in
a main/sub configuration as the sub-PMIC and both are used on the
Google Pixel 6 and 6 Pro (oriole / raven).
A DT update for Oriole / Raven to enable these is required which I will
send out separately.
Cheers,
Andre'
Signed-off-by: André Draszik <andre.draszik@linaro.org>
---
Changes in v6:
- merge patch 21 into 15 (Bartosz)
- merge 'con-id' handling into patch 15
- collect tags
- Link to v5: https://lore.kernel.org/r/20251227-s2mpg1x-regulators-v5-0-0c04b360b4c9@linaro.org
Changes in v5:
- rebase against mfd/sec alarm IRQ rework
https://lore.kernel.org/all/20251217-s5m-alarm-v2-0-b7bff003e94c@linaro.org/
- switch to async probe for mfd
- Mark: one MFD cell per PMIC, not per PMIC rail - drop or update
related patches
- making the series runtime depend on
https://lore.kernel.org/r/20251227-regulators-defer-v1-0-3104b22d84cb@linaro.org
- new patch:
- mfd: sec: s2mpg10: reorder regulators for better probe performance
- collect tags
- Link to v4: https://lore.kernel.org/r/20251110-s2mpg1x-regulators-v4-0-94c9e726d4ba@linaro.org
Changes in v4:
- Krzysztof:
- s2mpg10-regulator.yaml: move additionalProperties to after allOf
- s2mpg10-regulator.yaml: use $defs, not definitions
- split samsung,s2mpg10-pmic.yaml and samsung,s2mpg11-pmic.yaml
- add full example for samsung,s2mpg10-pmic.yaml and 11
- acpm binding: commit message update
- acpm binding: pmic -> pmic-1, pmic2 -> pmic-2
- ensure binding file names match bindings
- fix typos in s2mpg11-regulator.yaml description text
- collect tags
- Link to v3: https://lore.kernel.org/r/20251103-s2mpg1x-regulators-v3-0-b8b96b79e058@linaro.org
Changes in v3:
- Krzysztof:
- split s2mpg10 core binding into separate file
- drop PCTRLSEL values that can be described using standard
properties, and update remaining macro names (self)
- drop maxItems:1 where not needed (Krzysztof)
- samsung,ext-control-gpios -> enable-gpios
- fix LDO20M_EN pin name -> VLDO20M_EN
- move all binding patternProperties to top-level
- one (driver) instance per actual rail, not per rail type (LDO or
buck)
- new macro REGULATOR_LINEAR_VRANGE() (patch 10)
- address some (pre-existing) checkpatch warnings
- various updates to regulator driver (patch 16 & 19).See footer there
- more descriptive commit messages
- Link to v2: https://lore.kernel.org/r/20250606-s2mpg1x-regulators-v2-0-b03feffd2621@linaro.org
Changes in v2:
- s2mpg11 also exposes additional GPIOs, update all relevant commit
messages (nevertheless, GPIOs are out of scope in this series)
- fix some commit message typos: s2mp1 -> s2mpg1
- patch2: drop | (literal style mark) from samsung,ext-control-gpios
- patch5: add | to vinb*-supply description for better formatting
- patch13: update ::of_parse_cb assignment
- patch15: drop duplicated ::of_parse_cb assignment
- Link to v1: https://lore.kernel.org/r/20250604-s2mpg1x-regulators-v1-0-6038740f49ae@linaro.org
---
André Draszik (20):
dt-bindings: firmware: google,gs101-acpm-ipc: convert regulators to lowercase
regulator: dt-bindings: add s2mpg10-pmic regulators
regulator: dt-bindings: add s2mpg11-pmic regulators
dt-bindings: mfd: samsung,s2mps11: Split s2mpg10-pmic into separate file
dt-bindings: mfd: samsung,s2mpg10-pmic: Link to its regulators
dt-bindings: mfd: Add samsung,s2mpg11-pmic
dt-bindings: firmware: google,gs101-acpm-ipc: add S2MPG11 secondary PMIC
mfd: sec: s2mpg10: reorder regulators for better probe performance
mfd: sec: Add support for S2MPG11 PMIC via ACPM
regulator: add REGULATOR_LINEAR_VRANGE macro
regulator: s2mps11: drop two needless variable initialisations
regulator: s2mps11: use dev_err_probe() where appropriate
regulator: s2mps11: place constants on right side of comparison tests
regulator: s2mps11: update node parsing (allow -supply properties)
regulator: s2mps11: refactor handling of external rail control
regulator: s2mps11: add S2MPG10 regulator
regulator: s2mps11: refactor S2MPG10 ::set_voltage_time() for S2MPG11 reuse
regulator: s2mps11: refactor S2MPG10 regulator macros for S2MPG11 reuse
regulator: s2mps11: add S2MPG11 regulator
regulator: s2mps11: more descriptive gpio consumer name
.../bindings/firmware/google,gs101-acpm-ipc.yaml | 54 +-
.../bindings/mfd/samsung,s2mpg10-pmic.yaml | 120 ++
.../bindings/mfd/samsung,s2mpg11-pmic.yaml | 88 ++
.../devicetree/bindings/mfd/samsung,s2mps11.yaml | 29 +-
.../regulator/samsung,s2mpg10-regulator.yaml | 158 +++
.../regulator/samsung,s2mpg11-regulator.yaml | 136 +++
MAINTAINERS | 1 +
drivers/mfd/sec-acpm.c | 171 ++-
drivers/mfd/sec-common.c | 17 +-
drivers/mfd/sec-irq.c | 85 +-
drivers/regulator/s2mps11.c | 1186 ++++++++++++++++++--
.../regulator/samsung,s2mpg10-regulator.h | 53 +
include/linux/mfd/samsung/core.h | 1 +
include/linux/mfd/samsung/irq.h | 105 ++
include/linux/mfd/samsung/s2mpg10.h | 44 +-
include/linux/mfd/samsung/s2mpg11.h | 434 +++++++
include/linux/regulator/driver.h | 5 +
17 files changed, 2526 insertions(+), 161 deletions(-)
---
base-commit: 5b108312d3874f2fc3d6e5ed119017b45c2eb092
change-id: 20250603-s2mpg1x-regulators-7a41c8399abf
Best regards,
--
André Draszik <andre.draszik@linaro.org>
On Mon, 05 Jan 2026, André Draszik wrote: > This series extends the existing S2MPG10 PMIC driver to add support for > the regulators, and adds new S2MPG11 core and regulator drivers. > > --- dependency note --- > This series must be applied in-order, due to the regulator drivers > depending on headers & definitions added by the bindings and core > drivers. I would expect them all to go via the MFD tree. > > The MFD patches in this series also depend on my Samsung MFD patches > due to patch context: > https://lore.kernel.org/all/20251217-s5m-alarm-v2-0-b7bff003e94c@linaro.org/ > > While these patches compile, regulator probe will only be successful > with my deferrable regulators patches from > https://lore.kernel.org/r/20251227-regulators-defer-v1-0-3104b22d84cb@linaro.org > --- end --- > > The patches are kept together in one series, due to S2MPG11 and its > regulators being very similar to S2MPG10. > > The Samsung S2MPG11 PMIC is a Power Management IC for mobile > applications with buck converters, various LDOs, power meters, and > additional GPIO interfaces. It typically complements an S2MPG10 PMIC in > a main/sub configuration as the sub-PMIC and both are used on the > Google Pixel 6 and 6 Pro (oriole / raven). > > A DT update for Oriole / Raven to enable these is required which I will > send out separately. > > Cheers, > Andre' > > Signed-off-by: André Draszik <andre.draszik@linaro.org> MFD pieces look okay to me. Once Mark provides his AB, I can merge the set. [...] -- Lee Jones [李琼斯]
On Tue, Jan 13, 2026 at 11:22:44AM +0000, Lee Jones wrote: > MFD pieces look okay to me. > Once Mark provides his AB, I can merge the set. Given that the bulk of the series is regulator changes I'd been expecting to take it?
On Tue, 13 Jan 2026, Mark Brown wrote: > On Tue, Jan 13, 2026 at 11:22:44AM +0000, Lee Jones wrote: > > > MFD pieces look okay to me. > > > Once Mark provides his AB, I can merge the set. > > Given that the bulk of the series is regulator changes I'd been > expecting to take it? I have no issues with that, providing you offer a succinct immutable branch containing just this set for me to pull from. Failing that, I have the machinery in place to offer you the same. -- Lee Jones [李琼斯]
On Wed, Jan 14, 2026 at 03:50:11PM +0000, Lee Jones wrote: > On Tue, 13 Jan 2026, Mark Brown wrote: > > Given that the bulk of the series is regulator changes I'd been > > expecting to take it? > I have no issues with that, providing you offer a succinct immutable > branch containing just this set for me to pull from. > Failing that, I have the machinery in place to offer you the same. Yeah, given what André said about dependencies if you could apply the MFD commits and send a PR that'd be great.
Hi Lee, On Wed, 2026-01-14 at 16:02 +0000, Mark Brown wrote: > On Wed, Jan 14, 2026 at 03:50:11PM +0000, Lee Jones wrote: > > On Tue, 13 Jan 2026, Mark Brown wrote: > > > > Given that the bulk of the series is regulator changes I'd been > > > expecting to take it? > > > I have no issues with that, providing you offer a succinct immutable > > branch containing just this set for me to pull from. > > > Failing that, I have the machinery in place to offer you the same. > > Yeah, given what André said about dependencies if you could apply the > MFD commits and send a PR that'd be great. Friendly ping. Is there anything else required to get this going please? Thanks, Andre'
On Tue, 20 Jan 2026, André Draszik wrote: > Hi Lee, > > On Wed, 2026-01-14 at 16:02 +0000, Mark Brown wrote: > > On Wed, Jan 14, 2026 at 03:50:11PM +0000, Lee Jones wrote: > > > On Tue, 13 Jan 2026, Mark Brown wrote: > > > > > > Given that the bulk of the series is regulator changes I'd been > > > > expecting to take it? > > > > > I have no issues with that, providing you offer a succinct immutable > > > branch containing just this set for me to pull from. > > > > > Failing that, I have the machinery in place to offer you the same. > > > > Yeah, given what André said about dependencies if you could apply the > > MFD commits and send a PR that'd be great. > > Friendly ping. Is there anything else required to get this going please? Don't do that! If you think the patch/set has been dropped (it hasn't) then please send a [RESEND]. I'll get around to it when I do my next round of reviews. -- Lee Jones [李琼斯]
On Tue, 20 Jan 2026, Lee Jones wrote: > On Tue, 20 Jan 2026, André Draszik wrote: > > > Hi Lee, > > > > On Wed, 2026-01-14 at 16:02 +0000, Mark Brown wrote: > > > On Wed, Jan 14, 2026 at 03:50:11PM +0000, Lee Jones wrote: > > > > On Tue, 13 Jan 2026, Mark Brown wrote: > > > > > > > > Given that the bulk of the series is regulator changes I'd been > > > > > expecting to take it? > > > > > > > I have no issues with that, providing you offer a succinct immutable > > > > branch containing just this set for me to pull from. > > > > > > > Failing that, I have the machinery in place to offer you the same. > > > > > > Yeah, given what André said about dependencies if you could apply the > > > MFD commits and send a PR that'd be great. > > > > Friendly ping. Is there anything else required to get this going please? > > Don't do that! > > If you think the patch/set has been dropped (it hasn't) then please send > a [RESEND]. I'll get around to it when I do my next round of reviews. And since I traverse my todo list in reverse chronological order, all you've achieved here is putting yourself at the bottom of the pile. =:| -- Lee Jones [李琼斯]
Hi Mark, Lee, On Tue, 2026-01-13 at 16:20 +0000, Mark Brown wrote: > On Tue, Jan 13, 2026 at 11:22:44AM +0000, Lee Jones wrote: > > > MFD pieces look okay to me. > > > Once Mark provides his AB, I can merge the set. > > Given that the bulk of the series is regulator changes I'd been > expecting to take it? Just FYI: 1) I just noticed I have to rebase/resend this mainly due to patch context of the binding updates. 2) this series depends on another MFD series of mine https://lore.kernel.org/all/20260113-s5m-alarm-v3-0-855a19db1277@linaro.org/ (again only due to patch context) which is still pending. I was under the (perhaps incorrect) impression that changes that touch MFD always go via the MFD tree. I guess that's not the case. I'll update the relevant phrasing in the cover letter with whatever you two decide :-) Cheers, Andre'
On Tue, 2026-01-13 at 17:28 +0000, André Draszik wrote: > Hi Mark, Lee, > > On Tue, 2026-01-13 at 16:20 +0000, Mark Brown wrote: > > On Tue, Jan 13, 2026 at 11:22:44AM +0000, Lee Jones wrote: > > > > > MFD pieces look okay to me. > > > > > Once Mark provides his AB, I can merge the set. > > > > Given that the bulk of the series is regulator changes I'd been > > expecting to take it? > > Just FYI: > 1) I just noticed I have to rebase/resend this mainly due to > patch context of the binding updates. I take this back, I got mixed up with a different branch. This series doesn't need rebasing and is good to go. A. > > 2) this series depends on another MFD series of mine > https://lore.kernel.org/all/20260113-s5m-alarm-v3-0-855a19db1277@linaro.org/ > (again only due to patch context) which is still pending. > > I was under the (perhaps incorrect) impression that changes that touch > MFD always go via the MFD tree. I guess that's not the case. I'll update > the relevant phrasing in the cover letter with whatever you two decide :-) > > > Cheers, > Andre'
On Mon, 05 Jan 2026 09:01:36 +0000, André Draszik wrote:
> This series extends the existing S2MPG10 PMIC driver to add support for
> the regulators, and adds new S2MPG11 core and regulator drivers.
>
> --- dependency note ---
> This series must be applied in-order, due to the regulator drivers
> depending on headers & definitions added by the bindings and core
> drivers. I would expect them all to go via the MFD tree.
>
> [...]
Applied, thanks!
[01/20] dt-bindings: firmware: google,gs101-acpm-ipc: convert regulators to lowercase
(no commit info)
[02/20] regulator: dt-bindings: add s2mpg10-pmic regulators
(no commit info)
[03/20] regulator: dt-bindings: add s2mpg11-pmic regulators
(no commit info)
[04/20] dt-bindings: mfd: samsung,s2mps11: Split s2mpg10-pmic into separate file
commit: c19ccbf37758f90064f7b1e32ec291954d97b426
[05/20] dt-bindings: mfd: samsung,s2mpg10-pmic: Link to its regulators
commit: ac1068790221a421e7bc4dacadfe8d39d6bec3a9
[06/20] dt-bindings: mfd: Add samsung,s2mpg11-pmic
commit: d0cd9ded4bdef73303e65abbeae47b00b7288059
[07/20] dt-bindings: firmware: google,gs101-acpm-ipc: add S2MPG11 secondary PMIC
(no commit info)
[08/20] mfd: sec: s2mpg10: reorder regulators for better probe performance
(no commit info)
[09/20] mfd: sec: Add support for S2MPG11 PMIC via ACPM
commit: 8e6c6e8ef5e241385eff14d4c8b8e45d5e762e84
[10/20] regulator: add REGULATOR_LINEAR_VRANGE macro
(no commit info)
[11/20] regulator: s2mps11: drop two needless variable initialisations
(no commit info)
[12/20] regulator: s2mps11: use dev_err_probe() where appropriate
(no commit info)
[13/20] regulator: s2mps11: place constants on right side of comparison tests
(no commit info)
[14/20] regulator: s2mps11: update node parsing (allow -supply properties)
(no commit info)
[15/20] regulator: s2mps11: refactor handling of external rail control
(no commit info)
[16/20] regulator: s2mps11: add S2MPG10 regulator
(no commit info)
[17/20] regulator: s2mps11: refactor S2MPG10 ::set_voltage_time() for S2MPG11 reuse
(no commit info)
[18/20] regulator: s2mps11: refactor S2MPG10 regulator macros for S2MPG11 reuse
(no commit info)
[19/20] regulator: s2mps11: add S2MPG11 regulator
(no commit info)
[20/20] regulator: s2mps11: more descriptive gpio consumer name
(no commit info)
--
Lee Jones [李琼斯]
On Thu, 22 Jan 2026, Lee Jones wrote: > On Mon, 05 Jan 2026 09:01:36 +0000, André Draszik wrote: > > This series extends the existing S2MPG10 PMIC driver to add support for > > the regulators, and adds new S2MPG11 core and regulator drivers. > > > > --- dependency note --- > > This series must be applied in-order, due to the regulator drivers > > depending on headers & definitions added by the bindings and core > > drivers. I would expect them all to go via the MFD tree. > > > > [...] > > Applied, thanks! > > [01/20] dt-bindings: firmware: google,gs101-acpm-ipc: convert regulators to lowercase > (no commit info) > [02/20] regulator: dt-bindings: add s2mpg10-pmic regulators > (no commit info) > [03/20] regulator: dt-bindings: add s2mpg11-pmic regulators > (no commit info) > [04/20] dt-bindings: mfd: samsung,s2mps11: Split s2mpg10-pmic into separate file > commit: c19ccbf37758f90064f7b1e32ec291954d97b426 > [05/20] dt-bindings: mfd: samsung,s2mpg10-pmic: Link to its regulators > commit: ac1068790221a421e7bc4dacadfe8d39d6bec3a9 > [06/20] dt-bindings: mfd: Add samsung,s2mpg11-pmic > commit: d0cd9ded4bdef73303e65abbeae47b00b7288059 > [07/20] dt-bindings: firmware: google,gs101-acpm-ipc: add S2MPG11 secondary PMIC > (no commit info) > [08/20] mfd: sec: s2mpg10: reorder regulators for better probe performance > (no commit info) > [09/20] mfd: sec: Add support for S2MPG11 PMIC via ACPM > commit: 8e6c6e8ef5e241385eff14d4c8b8e45d5e762e84 > [10/20] regulator: add REGULATOR_LINEAR_VRANGE macro > (no commit info) > [11/20] regulator: s2mps11: drop two needless variable initialisations > (no commit info) > [12/20] regulator: s2mps11: use dev_err_probe() where appropriate > (no commit info) > [13/20] regulator: s2mps11: place constants on right side of comparison tests > (no commit info) > [14/20] regulator: s2mps11: update node parsing (allow -supply properties) > (no commit info) > [15/20] regulator: s2mps11: refactor handling of external rail control > (no commit info) > [16/20] regulator: s2mps11: add S2MPG10 regulator > (no commit info) > [17/20] regulator: s2mps11: refactor S2MPG10 ::set_voltage_time() for S2MPG11 reuse > (no commit info) > [18/20] regulator: s2mps11: refactor S2MPG10 regulator macros for S2MPG11 reuse > (no commit info) > [19/20] regulator: s2mps11: add S2MPG11 regulator > (no commit info) > [20/20] regulator: s2mps11: more descriptive gpio consumer name > (no commit info) b4 is having another moment! I applied patches; 4, 5, 6, 8 and 9 from the v7 set. -- Lee Jones [李琼斯]
On Mon, 05 Jan 2026, André Draszik wrote: > This series extends the existing S2MPG10 PMIC driver to add support for > the regulators, and adds new S2MPG11 core and regulator drivers. > > --- dependency note --- > This series must be applied in-order, due to the regulator drivers > depending on headers & definitions added by the bindings and core > drivers. I would expect them all to go via the MFD tree. > > The MFD patches in this series also depend on my Samsung MFD patches > due to patch context: > https://lore.kernel.org/all/20251217-s5m-alarm-v2-0-b7bff003e94c@linaro.org/ > > While these patches compile, regulator probe will only be successful > with my deferrable regulators patches from > https://lore.kernel.org/r/20251227-regulators-defer-v1-0-3104b22d84cb@linaro.org > --- end --- > > The patches are kept together in one series, due to S2MPG11 and its > regulators being very similar to S2MPG10. > > The Samsung S2MPG11 PMIC is a Power Management IC for mobile > applications with buck converters, various LDOs, power meters, and > additional GPIO interfaces. It typically complements an S2MPG10 PMIC in > a main/sub configuration as the sub-PMIC and both are used on the > Google Pixel 6 and 6 Pro (oriole / raven). > > A DT update for Oriole / Raven to enable these is required which I will > send out separately. > > Cheers, > Andre' > > Signed-off-by: André Draszik <andre.draszik@linaro.org> Applying patch(es) Applying: dt-bindings: mfd: samsung,s2mps11: Split s2mpg10-pmic into separate file Applying: dt-bindings: mfd: samsung,s2mpg10-pmic: Link to its regulators Applying: dt-bindings: mfd: Add samsung,s2mpg11-pmic Applying: mfd: sec: s2mpg10: reorder regulators for better probe performance Applying: mfd: sec: Add support for S2MPG11 PMIC via ACPM error: invalid object 100644 11a56154d36d251d40b40e91da514db0faa15ae3 for 'drivers/mfd/sec-irq.c' error: Repository lacks necessary blobs to fall back on 3-way merge. Patch failed at 0005 mfd: sec: Add support for S2MPG11 PMIC via ACPM hint: Use 'git am --show-current-patch=diff' to see the failed patch hint: When you have resolved this problem, run "git am --continue". hint: If you prefer to skip this patch, run "git am --skip" instead. hint: To restore the original branch and stop patching, run "git am --abort". hint: Disable this message with "git config set advice.mergeConflict false" Doesn't apply to `for-mfd-next` or `ib-mfd-rtc-v6.20`. Please rebase. -- Lee Jones [李琼斯]
Hi Lee, On Thu, 2026-01-22 at 15:06 +0000, Lee Jones wrote: > On Mon, 05 Jan 2026, André Draszik wrote: > > > This series extends the existing S2MPG10 PMIC driver to add support for > > the regulators, and adds new S2MPG11 core and regulator drivers. > > > > --- dependency note --- > > This series must be applied in-order, due to the regulator drivers > > depending on headers & definitions added by the bindings and core > > drivers. I would expect them all to go via the MFD tree. > > > > The MFD patches in this series also depend on my Samsung MFD patches > > due to patch context: > > https://lore.kernel.org/all/20251217-s5m-alarm-v2-0-b7bff003e94c@linaro.org/ > > > > While these patches compile, regulator probe will only be successful > > with my deferrable regulators patches from > > https://lore.kernel.org/r/20251227-regulators-defer-v1-0-3104b22d84cb@linaro.org > > --- end --- > > > > The patches are kept together in one series, due to S2MPG11 and its > > regulators being very similar to S2MPG10. > > > > The Samsung S2MPG11 PMIC is a Power Management IC for mobile > > applications with buck converters, various LDOs, power meters, and > > additional GPIO interfaces. It typically complements an S2MPG10 PMIC in > > a main/sub configuration as the sub-PMIC and both are used on the > > Google Pixel 6 and 6 Pro (oriole / raven). > > > > A DT update for Oriole / Raven to enable these is required which I will > > send out separately. > > > > Cheers, > > Andre' > > > > Signed-off-by: André Draszik <andre.draszik@linaro.org> > > Applying patch(es) > Applying: dt-bindings: mfd: samsung,s2mps11: Split s2mpg10-pmic into separate file > Applying: dt-bindings: mfd: samsung,s2mpg10-pmic: Link to its regulators > Applying: dt-bindings: mfd: Add samsung,s2mpg11-pmic > Applying: mfd: sec: s2mpg10: reorder regulators for better probe performance > Applying: mfd: sec: Add support for S2MPG11 PMIC via ACPM > error: invalid object 100644 11a56154d36d251d40b40e91da514db0faa15ae3 for 'drivers/mfd/sec-irq.c' > error: Repository lacks necessary blobs to fall back on 3-way merge. > Patch failed at 0005 mfd: sec: Add support for S2MPG11 PMIC via ACPM > hint: Use 'git am --show-current-patch=diff' to see the failed patch > hint: When you have resolved this problem, run "git am --continue". > hint: If you prefer to skip this patch, run "git am --skip" instead. > hint: To restore the original branch and stop patching, run "git am --abort". > hint: Disable this message with "git config set advice.mergeConflict false" > > Doesn't apply to `for-mfd-next` or `ib-mfd-rtc-v6.20`. > > Please rebase. Strange, git rebase onto for-mfd-next had no trouble. I presume you used b4 am / shazam above? Just trying to understand why the difference. Anyway, rebased v7 is https://lore.kernel.org/r/20260122-s2mpg1x-regulators-v7-0-3b1f9831fffd@linaro.org Cheers, Andre'
On Thu, 22 Jan 2026, Lee Jones wrote:
> On Mon, 05 Jan 2026, André Draszik wrote:
>
> > This series extends the existing S2MPG10 PMIC driver to add support for
> > the regulators, and adds new S2MPG11 core and regulator drivers.
> >
> > --- dependency note ---
> > This series must be applied in-order, due to the regulator drivers
> > depending on headers & definitions added by the bindings and core
> > drivers. I would expect them all to go via the MFD tree.
> >
> > The MFD patches in this series also depend on my Samsung MFD patches
> > due to patch context:
> > https://lore.kernel.org/all/20251217-s5m-alarm-v2-0-b7bff003e94c@linaro.org/
> >
> > While these patches compile, regulator probe will only be successful
> > with my deferrable regulators patches from
> > https://lore.kernel.org/r/20251227-regulators-defer-v1-0-3104b22d84cb@linaro.org
> > --- end ---
> >
> > The patches are kept together in one series, due to S2MPG11 and its
> > regulators being very similar to S2MPG10.
> >
> > The Samsung S2MPG11 PMIC is a Power Management IC for mobile
> > applications with buck converters, various LDOs, power meters, and
> > additional GPIO interfaces. It typically complements an S2MPG10 PMIC in
> > a main/sub configuration as the sub-PMIC and both are used on the
> > Google Pixel 6 and 6 Pro (oriole / raven).
> >
> > A DT update for Oriole / Raven to enable these is required which I will
> > send out separately.
> >
> > Cheers,
> > Andre'
> >
> > Signed-off-by: André Draszik <andre.draszik@linaro.org>
>
> Applying patch(es)
> Applying: dt-bindings: mfd: samsung,s2mps11: Split s2mpg10-pmic into separate file
> Applying: dt-bindings: mfd: samsung,s2mpg10-pmic: Link to its regulators
> Applying: dt-bindings: mfd: Add samsung,s2mpg11-pmic
> Applying: mfd: sec: s2mpg10: reorder regulators for better probe performance
> Applying: mfd: sec: Add support for S2MPG11 PMIC via ACPM
> error: invalid object 100644 11a56154d36d251d40b40e91da514db0faa15ae3 for 'drivers/mfd/sec-irq.c'
> error: Repository lacks necessary blobs to fall back on 3-way merge.
> Patch failed at 0005 mfd: sec: Add support for S2MPG11 PMIC via ACPM
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> hint: When you have resolved this problem, run "git am --continue".
> hint: If you prefer to skip this patch, run "git am --skip" instead.
> hint: To restore the original branch and stop patching, run "git am --abort".
> hint: Disable this message with "git config set advice.mergeConflict false"
>
> Doesn't apply to `for-mfd-next` or `ib-mfd-rtc-v6.20`.
>
> Please rebase.
Also, FYI, you may wish to run some per-patch more tests:
"[PATCH v6 17/20] regulator: s2mps11: refactor S2MPG10" has no obvious style problems and is ready for submission.
WARNING: Argument '_r_mask' is not used in function-like macro
#102: FILE: drivers/regulator/s2mps11.c:759:
+#define regulator_desc_s2mpg1x_ldo_cmn(_name, _id, _supply, _ops, \
+ _vrange, _vsel_reg, _vsel_mask, _en_reg, _en_mask, \
_ramp_delay, _r_reg, _r_mask, _r_table, _r_table_sz) { \
+ .name = "ldo" _name, \
.supply_name = _supply, \
+ .of_match = of_match_ptr("ldo" _name), \
.regulators_node = of_match_ptr("regulators"), \
.of_parse_cb = s2mpg10_of_parse_cb, \
+ .id = _id, \
.ops = &(_ops)[0], \
.type = REGULATOR_VOLTAGE, \
.owner = THIS_MODULE, \
.linear_ranges = _vrange, \
.n_linear_ranges = ARRAY_SIZE(_vrange), \
.n_voltages = _vrange##_count, \
+ .vsel_reg = _vsel_reg, \
.vsel_mask = _vsel_mask, \
+ .enable_reg = _en_reg, \
.enable_mask = _en_mask, \
.ramp_delay = _ramp_delay, \
.ramp_reg = _r_reg, \
WARNING: Argument '_r_table' is not used in function-like macro
#102: FILE: drivers/regulator/s2mps11.c:759:
+#define regulator_desc_s2mpg1x_ldo_cmn(_name, _id, _supply, _ops, \
+ _vrange, _vsel_reg, _vsel_mask, _en_reg, _en_mask, \
_ramp_delay, _r_reg, _r_mask, _r_table, _r_table_sz) { \
+ .name = "ldo" _name, \
.supply_name = _supply, \
+ .of_match = of_match_ptr("ldo" _name), \
.regulators_node = of_match_ptr("regulators"), \
.of_parse_cb = s2mpg10_of_parse_cb, \
+ .id = _id, \
.ops = &(_ops)[0], \
.type = REGULATOR_VOLTAGE, \
.owner = THIS_MODULE, \
.linear_ranges = _vrange, \
.n_linear_ranges = ARRAY_SIZE(_vrange), \
.n_voltages = _vrange##_count, \
+ .vsel_reg = _vsel_reg, \
.vsel_mask = _vsel_mask, \
+ .enable_reg = _en_reg, \
.enable_mask = _en_mask, \
.ramp_delay = _ramp_delay, \
.ramp_reg = _r_reg, \
WARNING: Argument '_r_table_sz' is not used in function-like macro
#102: FILE: drivers/regulator/s2mps11.c:759:
+#define regulator_desc_s2mpg1x_ldo_cmn(_name, _id, _supply, _ops, \
+ _vrange, _vsel_reg, _vsel_mask, _en_reg, _en_mask, \
_ramp_delay, _r_reg, _r_mask, _r_table, _r_table_sz) { \
+ .name = "ldo" _name, \
.supply_name = _supply, \
+ .of_match = of_match_ptr("ldo" _name), \
.regulators_node = of_match_ptr("regulators"), \
.of_parse_cb = s2mpg10_of_parse_cb, \
+ .id = _id, \
.ops = &(_ops)[0], \
.type = REGULATOR_VOLTAGE, \
.owner = THIS_MODULE, \
.linear_ranges = _vrange, \
.n_linear_ranges = ARRAY_SIZE(_vrange), \
.n_voltages = _vrange##_count, \
+ .vsel_reg = _vsel_reg, \
.vsel_mask = _vsel_mask, \
+ .enable_reg = _en_reg, \
.enable_mask = _en_mask, \
.ramp_delay = _ramp_delay, \
.ramp_reg = _r_reg, \
--
Lee Jones [李琼斯]
On Thu, 2026-01-22 at 15:11 +0000, Lee Jones wrote: > > Also, FYI, you may wish to run some per-patch more tests: > > "[PATCH v6 17/20] regulator: s2mps11: refactor S2MPG10" has no obvious style problems and is ready for submission. > WARNING: Argument '_r_mask' is not used in function-like macro > #102: FILE: drivers/regulator/s2mps11.c:759: > [...] > WARNING: Argument '_r_table' is not used in function-like macro > #102: FILE: drivers/regulator/s2mps11.c:759: > [...] > WARNING: Argument '_r_table_sz' is not used in function-like macro > #102: FILE: drivers/regulator/s2mps11.c:759: This is mentioned in the commit message and they are false-positives due to patch context Cheers, Andre'
On Mon, 05 Jan 2026 09:01:36 +0000, André Draszik wrote:
> This series extends the existing S2MPG10 PMIC driver to add support for
> the regulators, and adds new S2MPG11 core and regulator drivers.
>
> --- dependency note ---
> This series must be applied in-order, due to the regulator drivers
> depending on headers & definitions added by the bindings and core
> drivers. I would expect them all to go via the MFD tree.
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next
Thanks!
[02/20] regulator: dt-bindings: add s2mpg10-pmic regulators
commit: 71bc6adae4102550717a8eeaa21d3f76f5149ac6
[03/20] regulator: dt-bindings: add s2mpg11-pmic regulators
commit: 030158c0528d1cbfbe9eebed09bad604f6135734
[10/20] regulator: add REGULATOR_LINEAR_VRANGE macro
commit: 7d33c0a4c6a3356db2b2f599820baf75d3753d44
[11/20] regulator: s2mps11: drop two needless variable initialisations
commit: 0809d3dcc0dd8f597adbcd4d881063eb1b437987
[12/20] regulator: s2mps11: use dev_err_probe() where appropriate
commit: 6430d65d7b74712e9ff60e270687d66265dad6f2
[13/20] regulator: s2mps11: place constants on right side of comparison tests
commit: 223cefd021fa6ef5687159836871907aa3084fe2
[14/20] regulator: s2mps11: update node parsing (allow -supply properties)
commit: 5b3c95739d674794730fbf3c678206f302609d27
[15/20] regulator: s2mps11: refactor handling of external rail control
commit: 0042c880e43c54c9bf19c24a72e54eeea37995e3
[16/20] regulator: s2mps11: add S2MPG10 regulator
commit: a2b8b9f33ce30ab51b33b52dc52e55d6930b9a02
[17/20] regulator: s2mps11: refactor S2MPG10 ::set_voltage_time() for S2MPG11 reuse
commit: 8f23cfbe4463c3de2e552aed106e179c0c932b6e
[18/20] regulator: s2mps11: refactor S2MPG10 regulator macros for S2MPG11 reuse
commit: 102dd11fc98261675a0664de1466616d7dad8d91
[19/20] regulator: s2mps11: add S2MPG11 regulator
commit: 979dd8da76eb98b212f4e8cafc3c4019cfa3d93d
[20/20] regulator: s2mps11: more descriptive gpio consumer name
commit: fe8429a2717fc01082502b0adf680a50b230eff7
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
© 2016 - 2026 Red Hat, Inc.