From patchwork Fri Sep 25 15:54:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Dannenberg X-Patchwork-Id: 7266101 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E32C2BEEC1 for ; Fri, 25 Sep 2015 15:56:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ECEA52054C for ; Fri, 25 Sep 2015 15:56:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 634C020AAD for ; Fri, 25 Sep 2015 15:56:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932569AbbIYP4F (ORCPT ); Fri, 25 Sep 2015 11:56:05 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:42119 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932539AbbIYP4D (ORCPT ); Fri, 25 Sep 2015 11:56:03 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id t8PFtGkI032529; Fri, 25 Sep 2015 10:55:16 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8PFtGNO008332; Fri, 25 Sep 2015 10:55:16 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.224.2; Fri, 25 Sep 2015 10:55:17 -0500 Received: from beast.tx.rr.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8PFsRVT013641; Fri, 25 Sep 2015 10:55:13 -0500 From: Andreas Dannenberg To: Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse , Laurentiu Palcu , Krzysztof Kozlowski CC: Ramakrishna Pallala , , , , Andreas Dannenberg Subject: [PATCH v7 14/15] power: bq24257: Add platform data based initialization Date: Fri, 25 Sep 2015 10:54:19 -0500 Message-ID: <1443196460-26156-15-git-send-email-dannenberg@ti.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1443196460-26156-1-git-send-email-dannenberg@ti.com> References: <1443196460-26156-1-git-send-email-dannenberg@ti.com> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The patch adds a way to setup and initialize the device through the use of platform data with configuration options equivalent to when using device firmware (DT or ACPI) for systems where this is not available. Signed-off-by: Andreas Dannenberg --- drivers/power/bq24257_charger.c | 39 +++++++++++++++++++++++++++++++++-- include/linux/power/bq24257_charger.h | 25 ++++++++++++++++++++++ 2 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 include/linux/power/bq24257_charger.h diff --git a/drivers/power/bq24257_charger.c b/drivers/power/bq24257_charger.c index 19a0962..3b1a3b6 100644 --- a/drivers/power/bq24257_charger.c +++ b/drivers/power/bq24257_charger.c @@ -27,10 +27,13 @@ #include #include #include +#include #include #include +#include + #define BQ24257_REG_1 0x00 #define BQ24257_REG_2 0x01 #define BQ24257_REG_3 0x02 @@ -885,6 +888,36 @@ static void bq24257_pg_gpio_probe(struct bq24257_device *bq) dev_dbg(bq->dev, "probed PG pin = %d\n", desc_to_gpio(bq->pg)); } +static void bq24257_pdata_probe(struct bq24257_device *bq, + struct bq24257_platform_data *pdata) +{ + bq->init_data.ichg = bq24257_find_idx(pdata->ichg, + bq24257_ichg_map, + BQ24257_ICHG_MAP_SIZE); + + bq->init_data.vbat = bq24257_find_idx(pdata->vbat, + bq24257_vbat_map, + BQ24257_VBAT_MAP_SIZE); + + bq->init_data.iterm = bq24257_find_idx(pdata->iterm, + bq24257_iterm_map, + BQ24257_ITERM_MAP_SIZE); + + bq->init_data.iilimit = bq24257_find_idx(pdata->iilimit, + bq24257_iilimit_map, + BQ24257_IILIMIT_MAP_SIZE); + + bq->init_data.vovp = bq24257_find_idx(pdata->vovp, + bq24257_vovp_map, + BQ24257_VOVP_MAP_SIZE); + + bq->init_data.vindpm = bq24257_find_idx(pdata->vindpm, + bq24257_vindpm_map, + BQ24257_VINDPM_MAP_SIZE); + + bq->iilimit_autoset_enable = pdata->iilimit_autoset_enable; +} + static int bq24257_fw_probe(struct bq24257_device *bq) { int ret; @@ -960,6 +993,7 @@ static int bq24257_probe(struct i2c_client *client, struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); struct device *dev = &client->dev; const struct acpi_device_id *acpi_id; + struct bq24257_platform_data *pdata = client->dev.platform_data; struct bq24257_device *bq; int ret; int i; @@ -1009,14 +1043,15 @@ static int bq24257_probe(struct i2c_client *client, i2c_set_clientdata(client, bq); - if (!dev->platform_data) { + if (!pdata) { ret = bq24257_fw_probe(bq); if (ret < 0) { dev_err(dev, "Cannot read device properties.\n"); return ret; } } else { - return -ENODEV; + dev_dbg(dev, "init using platform data\n"); + bq24257_pdata_probe(bq, pdata); } /* diff --git a/include/linux/power/bq24257_charger.h b/include/linux/power/bq24257_charger.h new file mode 100644 index 0000000..c131c5d --- /dev/null +++ b/include/linux/power/bq24257_charger.h @@ -0,0 +1,25 @@ +/* + * Platform data for the TI bq24257 battery charger driver. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef _BQ24257_CHARGER_H_ +#define _BQ24257_CHARGER_H_ + +#include +#include + +struct bq24257_platform_data { + u32 ichg; /* charge current (uA) */ + u32 vbat; /* regulation voltage (uV) */ + u32 iterm; /* termination current (uA) */ + u32 iilimit; /* input current limit (uA) */ + u32 vovp; /* over voltage protection voltage (uV) */ + u32 vindpm; /* VDMP input threshold voltage (uV) */ + bool iilimit_autoset_enable; /* auto-detect of input current limit */ +}; + +#endif /* _BQ24257_CHARGER_H_ */