| Message ID | 20210312083604.3708890-1-linus.walleij@linaro.org |
|---|---|
| Headers | show |
| Series | mfd/power: Push data into power supply | expand |
On Fri, Mar 12, 2021 at 9:36 AM Linus Walleij <linus.walleij@linaro.org> wrote:
> - The power maintainer (Sebastian) provide an ACK
Ooops I noticed actuall Sebastian already gave an ACK for these
patches:
https://lore.kernel.org/linux-pm/20210128001700.pkuyfpq6uzcjb5ud@earth.universe/
Sorry for keeping bad track.
This means Lee can add Sebastians ACK and
merge these patches at will. (I can also resend
with the ACKs if need be.)
Yours,
Linus Walleij
Enjoy!
The following changes since commit a38fd8748464831584a19438cbb3082b5a2dab15:
Linux 5.12-rc2 (2021-03-05 17:33:41 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-power-v5.13
for you to fetch changes up to ee0975c3089e1c3357ccc3ada7a94a95b61e708c:
mfd/power: ab8500: Push data to power supply code (2021-03-22 14:56:02 +0000)
----------------------------------------------------------------
Immutable branch between MFD and Power due for the v5.13 merge window
----------------------------------------------------------------
Linus Walleij (4):
power: ab8500: Require device tree
mfd/power: ab8500: Push data to power supply code
mfd/power: ab8500: Push algorithm to power supply code
mfd/power: ab8500: Push data to power supply code
drivers/mfd/ab8500-core.c | 17 +-
drivers/power/supply/Kconfig | 2 +-
.../abx500 => drivers/power/supply}/ab8500-bm.h | 297 +++++++++++++++++++--
.../power/supply/ab8500-chargalg.h | 6 +-
drivers/power/supply/ab8500_bmdata.c | 3 +-
drivers/power/supply/ab8500_btemp.c | 45 +---
drivers/power/supply/ab8500_charger.c | 27 +-
drivers/power/supply/ab8500_fg.c | 20 +-
drivers/power/supply/abx500_chargalg.c | 22 +-
drivers/power/supply/pm2301_charger.c | 4 +-
include/linux/mfd/abx500.h | 276 -------------------
11 files changed, 326 insertions(+), 393 deletions(-)
rename {include/linux/mfd/abx500 => drivers/power/supply}/ab8500-bm.h (58%)
rename include/linux/mfd/abx500/ux500_chargalg.h => drivers/power/supply/ab8500-chargalg.h (93%)
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
On Tue, Mar 23, 2021 at 9:57 AM Lee Jones <lee.jones@linaro.org> wrote:
> git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-power-v5.13
Thanks so much for fixing this Lee!
Sebastian: if you decide to pull this in I can iterate some more
patches to the AB8500 BM code this merge window, else I will
just defer to after v5.13-rc1.
Yours,
Linus Walleij
Hi, On Tue, Mar 23, 2021 at 10:11:18AM +0100, Linus Walleij wrote: > On Tue, Mar 23, 2021 at 9:57 AM Lee Jones <lee.jones@linaro.org> wrote: > > > git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-power-v5.13 > > Thanks so much for fixing this Lee! > > Sebastian: if you decide to pull this in I can iterate some more > patches to the AB8500 BM code this merge window, else I will > just defer to after v5.13-rc1. I pulled this in, but it's probably too late for 5.13 now. But it means you do not need to wait before (re)sending the remaining patches. Thanks, -- Sebastian
This series pushes some AB8500 power supply headers down into the power supply subsystem so the power supply code becomes independent from the other AB8500 stuff. The first patch makes the code require device tree so that the series make sense: once all data for the power supply comes from device tree, it makes sense for that code to not require global headers for platform data etc. This is in preparation for some finalization of the AB8500 power code, as merge strategy I think it is best if: - The power maintainer (Sebastian) provide an ACK - The MFD matinainer (Lee) merges this and provide an immutable branch that the power maintainer can possibly pull as a base for his tree I hope both subsystems are happy with the changes. One of the patches already has Lee's Acked-for-MFD, but I got a bit stressed out in the last kernel cycle. Let's take this stepwise, first these four patches. No hurry. Linus Walleij (4): mfd/power: ab8500: Require device tree mfd/power: ab8500: Push data to power supply code mfd/power: ab8500: Push algorithm to power supply code mfd/power: ab8500: Push data to power supply code drivers/mfd/ab8500-core.c | 17 +- drivers/power/supply/Kconfig | 2 +- .../power/supply}/ab8500-bm.h | 297 ++++++++++++++++-- .../power/supply/ab8500-chargalg.h | 6 +- drivers/power/supply/ab8500_bmdata.c | 3 +- drivers/power/supply/ab8500_btemp.c | 45 +-- drivers/power/supply/ab8500_charger.c | 27 +- drivers/power/supply/ab8500_fg.c | 20 +- drivers/power/supply/abx500_chargalg.c | 22 +- drivers/power/supply/pm2301_charger.c | 4 +- include/linux/mfd/abx500.h | 276 ---------------- 11 files changed, 326 insertions(+), 393 deletions(-) rename {include/linux/mfd/abx500 => drivers/power/supply}/ab8500-bm.h (58%) rename include/linux/mfd/abx500/ux500_chargalg.h => drivers/power/supply/ab8500-chargalg.h (93%) -- 2.29.2