[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <a757fcf1-0215-3926-f74c-22183457be3e@ti.com>
Date: Wed, 29 Jul 2020 10:55:54 -0500
From: Dan Murphy <dmurphy@...com>
To: <sre@...nel.org>, <afd@...com>, <pali@...nel.org>
CC: <linux-pm@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<devicetree@...r.kernel.org>, <robh@...nel.org>
Subject: Re: [PATCH v5 2/4] power: supply: bq27xxx_battery: Add the BQ27z561
Battery monitor
Hello
On 7/29/20 7:06 AM, Dan Murphy wrote:
> Add the Texas Instruments BQ27z561 battery monitor. The register address
> map is laid out the same as compared to other devices within the file.
> The battery status register has differing bits to determine if the
> battery is full, discharging or dead.
>
> Signed-off-by: Dan Murphy <dmurphy@...com>
> ---
> drivers/power/supply/bq27xxx_battery.c | 69 +++++++++++++++++++++-
> drivers/power/supply/bq27xxx_battery_i2c.c | 2 +
> include/linux/power/bq27xxx_battery.h | 1 +
> 3 files changed, 71 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c
> index acaafed037be..a858e3b2a0ee 100644
> --- a/drivers/power/supply/bq27xxx_battery.c
> +++ b/drivers/power/supply/bq27xxx_battery.c
> @@ -18,6 +18,7 @@
> * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
> *
> * Datasheets:
> +<<<<<<< HEAD
Need to remove this artifact from a rebase.
Not sure how this got here as it does not appear in my source.
Dan
Powered by blists - more mailing lists