From patchwork Tue Jan 15 12:55:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 1977711 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 B8C33DF264 for ; Tue, 15 Jan 2013 13:04:38 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Tv66G-0007MU-Fy; Tue, 15 Jan 2013 12:58:47 +0000 Received: from mail-wg0-f52.google.com ([74.125.82.52]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Tv64A-0006WH-IS for linux-arm-kernel@lists.infradead.org; Tue, 15 Jan 2013 12:56:35 +0000 Received: by mail-wg0-f52.google.com with SMTP id 12so38062wgh.31 for ; Tue, 15 Jan 2013 04:56:32 -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=Q225edHwDo735qzW+Zv48G0aaJGxIgDxvtE6vRRMc70=; b=nSHUkCWYUikQtMgbMaQXIzHNRF1hgLUBoiABLW5V3aJt3MvxhEXdRVOcSEB3Z0Bj9c /6n+52+0JbiV4rItLsl3/RpdwO5eak9hDUFtJ2xP85bzsTaUZp+0KqyJRX2TJEOZ7n+s WGBdH8db+jfOf341/devJHqRkboaJQUSaVoHMOmqjmsFQlPEP+LmOwqowNUuSCj+DY0j Id1whGUIvS0VJcUnqImIys55ojRrfm36CGnKhtehUWeGJUtXfb+h1aPHMyOy8EI/tdXN vO2IF1T1OiClMljx+L/7cUY9TtdImcghIUmHEQytnisu9a7x4J25dblTfavvOPRfO2W3 bIXg== X-Received: by 10.194.88.98 with SMTP id bf2mr141895797wjb.49.1358254592711; Tue, 15 Jan 2013 04:56:32 -0800 (PST) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id eo10sm3672833wib.9.2013.01.15.04.56.31 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Jan 2013 04:56:32 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/26] mfd: ab8500-sysctrl.c: Provide charging as reset reason Date: Tue, 15 Jan 2013 12:55:44 +0000 Message-Id: <1358254566-12419-5-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1358254566-12419-1-git-send-email-lee.jones@linaro.org> References: <1358254566-12419-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlaLZYmkseYw+2BZ5cRA/+ACSRkC5T+i4Q6uoJYyNlyOg3BwmMf/N46nmRcSgMQDx7J+s3p X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130115_075635_221850_0B22C1B2 X-CRM114-Status: GOOD ( 11.70 ) 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 [74.125.82.52 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Jonas Aaberg , Lee Jones , linus.walleij@stericsson.com, arnd@arndb.de, sameo@linux.intel.com 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 From: Jonas Aaberg It's possible to supply a string to provide a reason for triggering a restart. In this case our reason is to enter charging-only mode, as a charger was found to be present. Signed-off-by: Lee Jones Signed-off-by: Jonas Aaberg Reviewed-by: Karl KOMIEROWSKI --- drivers/mfd/ab8500-sysctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mfd/ab8500-sysctrl.c b/drivers/mfd/ab8500-sysctrl.c index 26216e7..cf58f69 100644 --- a/drivers/mfd/ab8500-sysctrl.c +++ b/drivers/mfd/ab8500-sysctrl.c @@ -59,7 +59,7 @@ void ab8500_power_off(void) "Charger \"%s\" is connected with known battery." " Rebooting.\n", pss[i]); - machine_restart(NULL); + machine_restart("charging"); } }