[v7,00/10] Add support for XO 1.75 to OLPC battery driver

Message

Lubomir Rintel April 18, 2019, 2:46 p.m. UTC

Hello,

This patch set modifies the OLPC battery driver so that it could eventually
be used on an Arm-based OLPC XO 1.75 machine.

Compared to the previous version, it addresses review comments for the
x86 platform parts from Thomas Gleixner. Details in individual patches'
change logs.

I've failed to version the previous iteration of the set that should've
been "v6" for the change logs to make sense. Sorry for that.

Thank you,
Lubo

Comments

Sebastian Reichel April 18, 2019, 8:20 p.m. UTC | #1

Hi,

On Thu, Apr 18, 2019 at 04:46:45PM +0200, Lubomir Rintel wrote:
> This patch set modifies the OLPC battery driver so that it could eventually
> be used on an Arm-based OLPC XO 1.75 machine.
> 
> Compared to the previous version, it addresses review comments for the
> x86 platform parts from Thomas Gleixner. Details in individual patches'
> change logs.
> 
> I've failed to version the previous iteration of the set that should've
> been "v6" for the change logs to make sense. Sorry for that.
> 
> Thank you,
> Lubo

I queued up the complete patchset via an immutable branch based on
v5.1-rc1. X86 maintainers can pull this signed immutable branch as
required. Thanks for the patches,

-- Sebastian

The following changes since commit 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b:

  Linux 5.1-rc1 (2019-03-17 14:22:26 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git tags/psy-olpc-1.75-battery-signed

for you to fetch changes up to 31e220877981d0005d0c4a76f68027a73131212b:

  power: supply: olpc_battery: Have the framework register sysfs files for us (2019-04-18 21:55:04 +0200)

----------------------------------------------------------------
Immutable branch between x86 and power-supply for OLPC

This immutable branch contains the changes required for OLPC
1.75 battery, which touches x86 and power-supply and is based
on v5.1-rc1.

Signed-off-by: Sebastian Reichel <[e-mail]>

----------------------------------------------------------------
Lubomir Rintel (10):
      dt-bindings: olpc_battery: Add XO-1.5 battery
      x86/platform/olpc: Don't split string literals when fixing up the DT
      x86/platform/olpc: Trivial code move in DT fixup
      x86/platform/olpc: Use a correct version when making up a battery node
      power: supply: olpc_battery: Use DT to get battery version
      power: supply: olpc_battery: Move priv data to a struct
      power: supply: olpc_battery: Use devm_power_supply_register()
      power: supply: olpc_battery: Avoid using platform_info
      power: supply: olpc_battery: Add OLPC XO 1.75 support
      power: supply: olpc_battery: Have the framework register sysfs files for us

 .../bindings/power/supply/olpc_battery.txt         |   2 +-
 arch/x86/platform/olpc/olpc_dt.c                   | 101 ++++++++----
 drivers/power/supply/olpc_battery.c                | 169 +++++++++++++--------
 3 files changed, 177 insertions(+), 95 deletions(-)

Ingo Molnar April 19, 2019, 7:57 a.m. UTC | #2

* Sebastian Reichel <[e-mail]> wrote:

> Hi,
> 
> On Thu, Apr 18, 2019 at 04:46:45PM +0200, Lubomir Rintel wrote:
> > This patch set modifies the OLPC battery driver so that it could eventually
> > be used on an Arm-based OLPC XO 1.75 machine.
> > 
> > Compared to the previous version, it addresses review comments for the
> > x86 platform parts from Thomas Gleixner. Details in individual patches'
> > change logs.
> > 
> > I've failed to version the previous iteration of the set that should've
> > been "v6" for the change logs to make sense. Sorry for that.
> > 
> > Thank you,
> > Lubo
> 
> I queued up the complete patchset via an immutable branch based on
> v5.1-rc1. X86 maintainers can pull this signed immutable branch as
> required. Thanks for the patches,

Would you mind sending these patches to Linus yourself, as part of the 
power-supply tree?

That's where it really belongs, the impact on arch/x86/ was mostly 
drive-by (and it's now all Acked-by Thomas), the meat of the changes is 
in the OLPC battery driver.

Thanks,

	Ingo

Sebastian Reichel April 19, 2019, 12:42 p.m. UTC | #3

Hi Ingo,

On Fri, Apr 19, 2019 at 09:57:16AM +0200, Ingo Molnar wrote:
> > On Thu, Apr 18, 2019 at 04:46:45PM +0200, Lubomir Rintel wrote:
> > > This patch set modifies the OLPC battery driver so that it could eventually
> > > be used on an Arm-based OLPC XO 1.75 machine.
> > > 
> > > Compared to the previous version, it addresses review comments for the
> > > x86 platform parts from Thomas Gleixner. Details in individual patches'
> > > change logs.
> > > 
> > > I've failed to version the previous iteration of the set that should've
> > > been "v6" for the change logs to make sense. Sorry for that.
> > > 
> > > Thank you,
> > > Lubo
> > 
> > I queued up the complete patchset via an immutable branch based on
> > v5.1-rc1. X86 maintainers can pull this signed immutable branch as
> > required. Thanks for the patches,
> 
> Would you mind sending these patches to Linus yourself, as part of the 
> power-supply tree?
> 
> That's where it really belongs, the impact on arch/x86/ was mostly 
> drive-by (and it's now all Acked-by Thomas), the meat of the changes is 
> in the OLPC battery driver.

Yes, I merged the immutable branch into power-supply. You can either
also merge it (e.g. when you plan to add other changes), or just ignore
it :) This is what I usually do with other subsystems to avoid
pointless merge conflicts.

TLDR: Yes.

-- Sebastian