From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754878Ab1K1T4R (ORCPT ); Mon, 28 Nov 2011 14:56:17 -0500 Received: from mail-qw0-f46.google.com ([209.85.216.46]:63889 "EHLO mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754452Ab1K1TzT (ORCPT ); Mon, 28 Nov 2011 14:55:19 -0500 From: dirk.brandewie@gmail.com To: linux-kernel@vger.kernel.org Cc: cbouatmailru@gmail.com, dg77.kim@samsung.com, kyungmin.park@samsung.com, myungjoo.ham@samsung.com, Jason.Wortham@maxim-ic.com, alan@linux.intel.com, Dirk Brandewie Subject: [PATCH 1/4] max17042: Move power suppply registration to a worker thread Date: Mon, 28 Nov 2011 11:49:50 -0800 Message-Id: <1322509793-10800-2-git-send-email-dirk.brandewie@gmail.com> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1322509793-10800-1-git-send-email-dirk.brandewie@gmail.com> References: <1322509793-10800-1-git-send-email-dirk.brandewie@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dirk Brandewie This patch move the final registration of the battery to a worker thread in preperation for adding the POR proceedure recommended by maxim. This is needed since the Maxim init proceedure requires two long delays totaling 850ms. This patch will reduce the impact on system boot time. The battery will not be available to the power supply subsystem until the init proceedure is complete Signed-off-by: Dirk Brandewie --- drivers/power/max17042_battery.c | 53 +++++++++++++++++++++++--------------- 1 files changed, 32 insertions(+), 21 deletions(-) diff --git a/drivers/power/max17042_battery.c b/drivers/power/max17042_battery.c index 9f0183c..33fdce0 100644 --- a/drivers/power/max17042_battery.c +++ b/drivers/power/max17042_battery.c @@ -34,6 +34,7 @@ struct max17042_chip { struct i2c_client *client; struct power_supply battery; struct max17042_platform_data *pdata; + struct work_struct work; }; static int max17042_write_reg(struct i2c_client *client, u8 reg, u16 value) @@ -180,12 +181,40 @@ static int max17042_get_property(struct power_supply *psy, return 0; } +static void max17042_init_worker(struct work_struct *work) +{ + struct max17042_chip *chip = container_of(work, + struct max17042_chip, work); + struct i2c_client *client = chip->client; + int ret; + + + /* Initialize registers according to values from the platform data */ + if (chip->pdata->init_data) + max17042_set_reg(client, chip->pdata->init_data, + chip->pdata->num_init_data); + + if (!chip->pdata->enable_current_sense) { + max17042_write_reg(client, MAX17042_CGAIN, 0x0000); + max17042_write_reg(client, MAX17042_MiscCFG, 0x0003); + max17042_write_reg(client, MAX17042_LearnCFG, 0x0007); + } else { + if (chip->pdata->r_sns == 0) + chip->pdata->r_sns = MAX17042_DEFAULT_SNS_RESISTOR; + } + + ret = power_supply_register(&client->dev, &chip->battery); + if (ret) { + dev_err(&client->dev, "failed: power supply register\n"); + kfree(chip); + } +} + static int __devinit max17042_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); struct max17042_chip *chip; - int ret; if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA)) return -EIO; @@ -210,26 +239,8 @@ static int __devinit max17042_probe(struct i2c_client *client, if (!chip->pdata->enable_current_sense) chip->battery.num_properties -= 2; - ret = power_supply_register(&client->dev, &chip->battery); - if (ret) { - dev_err(&client->dev, "failed: power supply register\n"); - kfree(chip); - return ret; - } - - /* Initialize registers according to values from the platform data */ - if (chip->pdata->init_data) - max17042_set_reg(client, chip->pdata->init_data, - chip->pdata->num_init_data); - - if (!chip->pdata->enable_current_sense) { - max17042_write_reg(client, MAX17042_CGAIN, 0x0000); - max17042_write_reg(client, MAX17042_MiscCFG, 0x0003); - max17042_write_reg(client, MAX17042_LearnCFG, 0x0007); - } else { - if (chip->pdata->r_sns == 0) - chip->pdata->r_sns = MAX17042_DEFAULT_SNS_RESISTOR; - } + INIT_WORK(&chip->work, max17042_init_worker); + schedule_work(&chip->work); return 0; } -- 1.7.7.3