Re: [PATCH v6 00/20] Samsung S2MPG10 regulator and S2MPG11 PMIC drivers

[Lee Jones <lee@kernel.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>

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 [李琼斯]