diff mbox series

[v5,1/4] dt-bindings: power: Add BQ27z561 compatible

Message ID 20200729120609.22427-1-dmurphy@ti.com
State Not Applicable, archived
Headers show
Series [v5,1/4] dt-bindings: power: Add BQ27z561 compatible | expand

Checks

Context Check Description
robh/checkpatch success
robh/dt-meta-schema success

Commit Message

Dan Murphy July 29, 2020, 12:06 p.m. UTC 
Add the Texas Instruments bq27z561 battery monitor to the bq27xxx
binding.

Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
---

v5 - Rebased on power-next and changed bq27561->bq27z561

 Documentation/devicetree/bindings/power/supply/bq27xxx.yaml | 1 +
 1 file changed, 1 insertion(+)

Comments

Dan Murphy July 29, 2020, 3:55 p.m. UTC | #1 
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
Sebastian Reichel July 29, 2020, 4:56 p.m. UTC | #2 
Hi,

On Wed, Jul 29, 2020 at 10:55:54AM -0500, Dan Murphy wrote:
> > +<<<<<<< HEAD
> 
> Need to remove this artifact from a rebase.
> 
> Not sure how this got here as it does not appear in my source.

You don't see it in your source, since you removed it in patch 4.

-- Sebastian
Dan Murphy July 29, 2020, 6:27 p.m. UTC | #3 
Sebastian

On 7/29/20 11:56 AM, Sebastian Reichel wrote:
> Hi,
>
> On Wed, Jul 29, 2020 at 10:55:54AM -0500, Dan Murphy wrote:
>>> +<<<<<<< HEAD
>> Need to remove this artifact from a rebase.
>>
>> Not sure how this got here as it does not appear in my source.
> You don't see it in your source, since you removed it in patch 4.

OK I have v6 ready but I noticed a lot of checkpatch issues.

total: 20 errors, 8 warnings, 1923 lines checked

So I will submit v6 and fix the style issues in a follow up patch

Dan


> -- Sebastian
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/power/supply/bq27xxx.yaml b/Documentation/devicetree/bindings/power/supply/bq27xxx.yaml
index 03d1020a2e47..0aa33590ac24 100644
--- a/Documentation/devicetree/bindings/power/supply/bq27xxx.yaml
+++ b/Documentation/devicetree/bindings/power/supply/bq27xxx.yaml
@@ -49,6 +49,7 @@  properties:
       - ti,bq27426
       - ti,bq27441
       - ti,bq27621
+      - ti,bq27z561
 
   reg:
     maxItems: 1