From patchwork Mon Jan 21 12:03:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 2011501 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 8BF92DF23A for ; Mon, 21 Jan 2013 12:08:15 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TxG89-0006aT-N9; Mon, 21 Jan 2013 12:05:37 +0000 Received: from mail-wi0-f171.google.com ([209.85.212.171]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TxG86-0006Z1-J3 for linux-arm-kernel@lists.infradead.org; Mon, 21 Jan 2013 12:05:35 +0000 Received: by mail-wi0-f171.google.com with SMTP id hn14so7060510wib.16 for ; Mon, 21 Jan 2013 04:04:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=hnIQ4e2YjlBG2J6A+7M0bRncMexkorkfbW4UOUTC2jk=; b=VU9TCzVGSHfmoLbJ89BCFySRbpiBJ1mQLoUo7aPZHHzDbOergZr7zC3BT8/Q6ZnwAw IBi0XGRPEMFtBkro6kesCwdMBs8U+iC1sUtskF3IA84inCS9Kt6Dr6RtT3qJ5P7c+zaU D588JA6E17ROykmcCB3/QWu4/dO0U6Rybmy5C2wJjPct/4EHhWc9KiVrHVFHleJPoyfB Dt04pRLR10HAuMZNbbaepJS8NhbeHWei/XRzq9Jvbe1vJ5fuDfRgzA8qdZfKl6AptUq9 TfpvrfpYkED4nwkBDJZugION4qnLg2obs1OpcohKEPMd6gHOBEjwyvpWs5MVfSE6EJy9 31HQ== X-Received: by 10.180.73.202 with SMTP id n10mr14993028wiv.17.1358769866429; Mon, 21 Jan 2013 04:04:26 -0800 (PST) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id i2sm16575305wiw.3.2013.01.21.04.04.24 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Jan 2013 04:04:25 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 05/24] ab8500-charger: Kick watchdog Date: Mon, 21 Jan 2013 12:03:41 +0000 Message-Id: <1358769840-4763-6-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1358769840-4763-1-git-send-email-lee.jones@linaro.org> References: <1358769840-4763-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQk5egybYxuReN0LMRWZUsQnFctuXaBAFIiLaHRF7XS5e2aqLMkYSQAi9nzFfW6RpAkfKv5p X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130121_070534_752410_DFBC276B X-CRM114-Status: GOOD ( 10.33 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.171 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: anton.vorontsov@linaro.org, Lee Jones , linus.walleij@stericsson.com, arnd@arndb.de, cbou@mail.ru X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Kicks the watchdog so charging will not stop. Signed-off-by: Lee Jones --- drivers/power/abx500_chargalg.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/power/abx500_chargalg.c b/drivers/power/abx500_chargalg.c index 78b6235..830b2dd 100644 --- a/drivers/power/abx500_chargalg.c +++ b/drivers/power/abx500_chargalg.c @@ -603,6 +603,8 @@ static void abx500_chargalg_hold_charging(struct abx500_chargalg *di) static void abx500_chargalg_start_charging(struct abx500_chargalg *di, int vset, int iset) { + bool start_chargalg_wd = true; + switch (di->chg_info.charger_type) { case AC_CHG: dev_dbg(di->dev, @@ -620,8 +622,12 @@ static void abx500_chargalg_start_charging(struct abx500_chargalg *di, default: dev_err(di->dev, "Unknown charger to charge from\n"); + start_chargalg_wd = false; break; } + + if (start_chargalg_wd && !delayed_work_pending(&di->chargalg_wd_work)) + queue_delayed_work(di->chargalg_wq, &di->chargalg_wd_work, 0); } /**