From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sebastian Reichel Subject: Re: [PATCH v2 16/17] power: supply: olpc_battery: Avoid using platform_info Date: Wed, 5 Dec 2018 21:59:51 +0100 Message-ID: <20181205205951.gzbezcu7s7ahuvm4@earth.universe> References: <20181116162403.49854-1-lkundrak@v3.sk> <20181116162403.49854-17-lkundrak@v3.sk> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="3rjcgjqrw5veodl3" Cc: Mark Brown , Geert Uytterhoeven , Darren Hart , Andy Shevchenko , Greg Kroah-Hartman , James Cameron , Rob Herring , Mark Rutland , Eric Miao , Haojian Zhuang , Daniel Mack , Robert Jarzmik , linux-spi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, platform-driver-x86@vger.kernel.org, devel@driverdev.osuosl.org, linux-pm@vger.kernel.org To: Lubomir Rintel Return-path: Content-Disposition: inline In-Reply-To: <20181116162403.49854-17-lkundrak@v3.sk> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-spi.vger.kernel.org --3rjcgjqrw5veodl3 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, On Fri, Nov 16, 2018 at 05:24:02PM +0100, Lubomir Rintel wrote: > This wouldn't work on the DT-based ARM platform. Let's read the EC version > directly from the EC driver instead. >=20 > This makes the driver no longer x86 specific. >=20 > Signed-off-by: Lubomir Rintel > Acked-by: Pavel Machek >=20 > --- > Changes since v1: > - Use uint8_t instead of unsigned char [1] for ecver >=20 > drivers/power/supply/Kconfig | 2 +- > drivers/power/supply/olpc_battery.c | 35 +++++++++++++++++++++-------- > 2 files changed, 27 insertions(+), 10 deletions(-) >=20 > diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig > index f27cf0709500..dd7ae1431098 100644 > --- a/drivers/power/supply/Kconfig > +++ b/drivers/power/supply/Kconfig > @@ -151,7 +151,7 @@ config BATTERY_PMU > =20 > config BATTERY_OLPC > tristate "One Laptop Per Child battery" > - depends on X86_32 && OLPC > + depends on OLPC > help > Say Y to enable support for the battery on the OLPC laptop. > =20 > diff --git a/drivers/power/supply/olpc_battery.c b/drivers/power/supply/o= lpc_battery.c > index 4433eb10a23d..ec5dfb8fcb8a 100644 > --- a/drivers/power/supply/olpc_battery.c > +++ b/drivers/power/supply/olpc_battery.c > @@ -20,8 +20,6 @@ > #include > #include > #include > -#include > - > =20 > #define EC_BAT_VOLTAGE 0x10 /* uint16_t, *9.76/32, mV */ > #define EC_BAT_CURRENT 0x11 /* int16_t, *15.625/120, mA */ > @@ -57,6 +55,7 @@ struct olpc_battery_data { > struct power_supply *olpc_ac; > struct power_supply *olpc_bat; > char bat_serial[17]; > + int new_proto; > }; > =20 > /********************************************************************* > @@ -100,7 +99,7 @@ static const struct power_supply_desc olpc_ac_desc =3D= { > static int olpc_bat_get_status(struct olpc_battery_data *data, > union power_supply_propval *val, uint8_t ec_byte) > { > - if (olpc_platform_info.ecver > 0x44) { > + if (data->new_proto) { > if (ec_byte & (BAT_STAT_CHARGING | BAT_STAT_TRICKLE)) > val->intval =3D POWER_SUPPLY_STATUS_CHARGING; > else if (ec_byte & BAT_STAT_DISCHARGING) > @@ -608,14 +607,32 @@ static int olpc_battery_probe(struct platform_devic= e *pdev) > struct power_supply_config psy_cfg =3D {}; > struct olpc_battery_data *data; > uint8_t status; > + uint8_t ecver; > + int ret; > + > + data =3D devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); > + if (!data) > + return -ENOMEM; > + platform_set_drvdata(pdev, data); This ended up in the wrong patch. Otherwise Reviewed-by: Sebastian Reichel -- Sebastian > + /* See if the EC is already there and get the EC revision */ > + ret =3D olpc_ec_cmd(EC_FIRMWARE_REV, NULL, 0, &ecver, 1); > + if (ret) { > + if (ret =3D=3D -ENODEV) > + return -EPROBE_DEFER; > + return ret; > + } > =20 > - /* > - * We've seen a number of EC protocol changes; this driver requires > - * the latest EC protocol, supported by 0x44 and above. > - */ > - if (olpc_platform_info.ecver < 0x44) { > + if (ecver > 0x44) { > + /* XO 1 or 1.5 with a new EC firmware. */ > + data->new_proto =3D 1; > + } else if (ecver < 0x44) { > + /* > + * We've seen a number of EC protocol changes; this driver > + * requires the latest EC protocol, supported by 0x44 and above. > + */ > printk(KERN_NOTICE "OLPC EC version 0x%02x too old for " > - "battery driver.\n", olpc_platform_info.ecver); > + "battery driver.\n", ecver); > return -ENXIO; > } > =20 > --=20 > 2.19.1 >=20 --3rjcgjqrw5veodl3 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEE72YNB0Y/i3JqeVQT2O7X88g7+poFAlwIPEcACgkQ2O7X88g7 +poUzA/+MDKKWBLbx8Hr90WRMNMTUHVfYF2XegkIstwfOqovl3XcAyC3jsKp4NRO YZWy6ukWIzcjQGQWJdl1SoyLILwj8lC5tCbfUuKnrN1+1tWlPdAfS97lwpUow59Y LCsQduI5YdlM0GM+ti9OdPm8a8dp2SwNWDzP2kteMnxl9CqM7E/7vWEUZposcO2V 9xFlAnApHktpE7vTu9KQnip7rJspBGIvBjnTyKj5NtbPppQghl9tsT9ylQgtkRim bbUfDI1qdmMa2Gdc4l2u3g/6rTBuNB3yvB17A68HUoSSpFsws6CG+3PqiqtMi9Dd 3oB3q7yknxpRSfpE63y7nQlt6/v6SZy6fAx9t8P7PrkLG3ckeTK0LPHwTWK6z5yH olgOCIeCjAkOa7RYdVwOzATCMx9kHX6Vib+EW/0fu924Bms43wTPkNAptjD+IbXS bpK5JazHW39MbhiVQs5wVTZRFs+DEZ7k7fJ7GHKeEjtwMoTzz55K9+R9cn7JAkxb 27A4X9MOlzycRmFOkv6qri9sX3g2P64EwBljNT5NaOrQQ90NT743okGBl6DGtQei LHeB6052XD+MwuAkQ7gLpWmpONqBL4x9Qsr9RvBB1DDhsAFOQx+NuxSlPlerukr/ R+Pc+2o/gyBI4FMOrGuhQh7q9Tqp2lmtaDublYj3UvjYDHoP9D4= =z5pl -----END PGP SIGNATURE----- --3rjcgjqrw5veodl3--