From: Dan Murphy <dmurphy@ti.com>
To: <sre@kernel.org>, <afd@ti.com>, <pali@kernel.org>
Cc: <linux-pm@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<devicetree@vger.kernel.org>, <robh@kernel.org>
Subject: Re: [PATCH v5 2/4] power: supply: bq27xxx_battery: Add the BQ27z561 Battery monitor
Date: Wed, 29 Jul 2020 10:55:54 -0500 [thread overview]
Message-ID: <a757fcf1-0215-3926-f74c-22183457be3e@ti.com> (raw)
In-Reply-To: <20200729120609.22427-2-dmurphy@ti.com>
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@ti.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
next prev parent reply other threads:[~2020-07-29 15:56 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-29 12:06 [PATCH v5 1/4] dt-bindings: power: Add BQ27z561 compatible Dan Murphy
2020-07-29 12:06 ` [PATCH v5 2/4] power: supply: bq27xxx_battery: Add the BQ27z561 Battery monitor Dan Murphy
2020-07-29 15:55 ` Dan Murphy [this message]
2020-07-29 16:56 ` Sebastian Reichel
2020-07-29 18:27 ` Dan Murphy
2020-07-29 12:06 ` [PATCH v5 3/4] dt-bindings: power: Add BQ28z610 compatible Dan Murphy
2020-07-29 12:06 ` [PATCH v5 4/4] power: supply: bq27xxx_battery: Add the BQ28z610 Battery monitor Dan Murphy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a757fcf1-0215-3926-f74c-22183457be3e@ti.com \
--to=dmurphy@ti.com \
--cc=afd@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=pali@kernel.org \
--cc=robh@kernel.org \
--cc=sre@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.