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: 14053 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 4AED223E2E for ; Tue, 15 Jan 2013 12:56:35 +0000 (UTC) Received: from mail-vb0-f48.google.com (mail-vb0-f48.google.com [209.85.212.48]) by fiordland.canonical.com (Postfix) with ESMTP id 05245A1931C for ; Tue, 15 Jan 2013 12:56:34 +0000 (UTC) Received: by mail-vb0-f48.google.com with SMTP id fc21so54385vbb.21 for ; Tue, 15 Jan 2013 04:56:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=Q225edHwDo735qzW+Zv48G0aaJGxIgDxvtE6vRRMc70=; b=YzXHwuZQZ7oMBzqzG4v9HA8pe/MDcSnsHca78ltHwLEAlC2oNy2maCc5oHX0Qagqxn eGTbhbWAA3hNbE4BNs9BGZ2L8UTijtDvttEawLKe/1olqFXSL9srDr/C86rgVNOI9Sa+ bknnri8bp09o49copgvG09EnKEe4VdeEV7Szf9Da2m1CIxgRiulbzB6hwS9qL3cqPv71 M7jbAYVPXAeGaw1Twi5MHnU0Jz+fmtDbdmJ+WI29qpBpXLFqPersEAqLJgL0kt2Np7t9 5hiYya7R9OAz8Y2GqFougZwFbQw82tMbeduV/22GH0JtI7k1F+f+mj79vtXdwh9zn6hw r4Lg== X-Received: by 10.52.176.6 with SMTP id ce6mr91863946vdc.57.1358254594449; Tue, 15 Jan 2013 04:56:34 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.145.101 with SMTP id st5csp110591veb; Tue, 15 Jan 2013 04:56:33 -0800 (PST) X-Received: by 10.194.24.42 with SMTP id r10mr33779426wjf.2.1358254593104; Tue, 15 Jan 2013 04:56:33 -0800 (PST) Received: from mail-wg0-x229.google.com ([2a00:1450:400c:c00::229]) by mx.google.com with ESMTPS id wo3si27416285wjc.53.2013.01.15.04.56.32 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Jan 2013 04:56:33 -0800 (PST) Received-SPF: neutral (google.com: 2a00:1450:400c:c00::229 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c00::229; Authentication-Results: mx.google.com; spf=neutral (google.com: 2a00:1450:400c:c00::229 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-wg0-f41.google.com with SMTP id ds1so1849190wgb.2 for ; Tue, 15 Jan 2013 04:56:32 -0800 (PST) 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 Cc: arnd@arndb.de, linus.walleij@stericsson.com, sameo@linux.intel.com, Jonas Aaberg , Lee Jones 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: ALoCoQmT2RPQxBwG/bOgkE2qoQBm/DZ4cSwoajdW4nvsHohk/Gn2lwJup67cJTBsMH7mHDLCzhEB 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"); } }