From patchwork Thu Oct 9 16:18:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 5059111 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5FCD19F349 for ; Thu, 9 Oct 2014 16:21:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6045E200D6 for ; Thu, 9 Oct 2014 16:21:27 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4FF39201DD for ; Thu, 9 Oct 2014 16:21:26 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XcGQq-0003Na-VN; Thu, 09 Oct 2014 16:19:12 +0000 Received: from mail-pa0-x22a.google.com ([2607:f8b0:400e:c03::22a]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XcGQm-0003JU-VY for linux-arm-kernel@lists.infradead.org; Thu, 09 Oct 2014 16:19:09 +0000 Received: by mail-pa0-f42.google.com with SMTP id bj1so58259pad.1 for ; Thu, 09 Oct 2014 09:18:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=gI2H++KBVGcfvi9BJGUiCfBdwOHHguPV096bTNxujFY=; b=f4ezFIt9uvAFZ/ALVFY+iXaT5NT2y93OE4c6GRfbLwj25yRcYHaKrzA95mHj9i8BqH 5f2U5lVgu8efGxGkRZ1oeKU2f+s7xdET2SV0IQNQXp9gZTZkemBtFHoamLqL66gSocYN ZjeLGibCSDCBpFeuIvPM4A6kd6kf5XMgJfkES/Y/g7t5U3EQ+SX36Jh/rEm9IXRbgKoU DoApIQGCOblMa9MYWhJKhZ1B57ae98Emah80lwL0PX5QbOaaBNFUnPt+WHyxkpT6P2jd yr+7acJTUkW6IsHxYoR27k/TelSGEMp1Gt2cJAV0/fBv8o7hNtz6lViM3vU1ZY98RynF R/1g== X-Received: by 10.70.88.136 with SMTP id bg8mr208523pdb.156.1412871528202; Thu, 09 Oct 2014 09:18:48 -0700 (PDT) Received: from localhost (99-61-164-40.lightspeed.sntcca.sbcglobal.net. [99.61.164.40]) by mx.google.com with ESMTPSA id uf6sm1051502pac.16.2014.10.09.09.18.47 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 09 Oct 2014 09:18:47 -0700 (PDT) From: Guenter Roeck To: linux-kernel@vger.kernel.org Subject: [PATCH] mfd: ab8500-sysctrl: Drop ab8500_restart Date: Thu, 9 Oct 2014 09:18:38 -0700 Message-Id: <1412871518-11359-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141009_091909_046189_BE4ECEDC X-CRM114-Status: GOOD ( 12.33 ) X-Spam-Score: 2.0 (++) Cc: Linus Walleij , Guenter Roeck , Lee Jones , Samuel Ortiz , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=0.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE, SUSPICIOUS_RECIPS, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=no 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 ab8500_restart is not called from anywhere in the kernel, so drop it. Cc: Linus Walleij Signed-off-by: Guenter Roeck Acked-by: Linus Walleij --- drivers/mfd/ab8500-sysctrl.c | 57 ------------------------------- include/linux/mfd/abx500/ab8500-sysctrl.h | 1 - 2 files changed, 58 deletions(-) diff --git a/drivers/mfd/ab8500-sysctrl.c b/drivers/mfd/ab8500-sysctrl.c index 8e0dae5..94dbcdd 100644 --- a/drivers/mfd/ab8500-sysctrl.c +++ b/drivers/mfd/ab8500-sysctrl.c @@ -85,63 +85,6 @@ shutdown: } } -/* - * Use the AB WD to reset the platform. It will perform a hard - * reset instead of a soft reset. Write the reset reason to - * the AB before reset, which can be read upon restart. - */ -void ab8500_restart(char mode, const char *cmd) -{ - struct ab8500_platform_data *plat; - struct ab8500_sysctrl_platform_data *pdata; - u16 reason = 0; - u8 val; - - if (sysctrl_dev == NULL) { - pr_err("%s: sysctrl not initialized\n", __func__); - return; - } - - plat = dev_get_platdata(sysctrl_dev->parent); - pdata = plat->sysctrl; - if (pdata && pdata->reboot_reason_code) - reason = pdata->reboot_reason_code(cmd); - else - pr_warn("[%s] No reboot reason set. Default reason %d\n", - __func__, reason); - - /* - * Disable RTC alarm, just a precaution so that no alarm - * is running when WD reset is executed. - */ - abx500_get_register_interruptible(sysctrl_dev, AB8500_RTC, - RTC_CTRL , &val); - abx500_set_register_interruptible(sysctrl_dev, AB8500_RTC, - RTC_CTRL , (val & ~RTC_ALARM_ENABLE)); - - /* - * Android is not using the RTC alarm registers during reboot - * so we borrow them for writing the reason of reset - */ - - /* reason[8 LSB] */ - val = reason & 0xFF; - abx500_set_register_interruptible(sysctrl_dev, AB8500_RTC, - AB8500_ALARM_MIN_LOW , val); - - /* reason[8 MSB] */ - val = (reason>>8) & 0xFF; - abx500_set_register_interruptible(sysctrl_dev, AB8500_RTC, - AB8500_ALARM_MIN_MID , val); - - /* Setting WD timeout to 0 */ - ab8500_sysctrl_write(AB8500_MAINWDOGTIMER, 0xFF, 0x0); - - /* Setting the parameters to AB8500 WD*/ - ab8500_sysctrl_write(AB8500_MAINWDOGCTRL, 0xFF, (AB8500_ENABLE_WD | - AB8500_WD_RESTART_ON_EXPIRE | AB8500_KICK_WD)); -} - static inline bool valid_bank(u8 bank) { return ((bank == AB8500_SYS_CTRL1_BLOCK) || diff --git a/include/linux/mfd/abx500/ab8500-sysctrl.h b/include/linux/mfd/abx500/ab8500-sysctrl.h index adba89d..6893127 100644 --- a/include/linux/mfd/abx500/ab8500-sysctrl.h +++ b/include/linux/mfd/abx500/ab8500-sysctrl.h @@ -12,7 +12,6 @@ int ab8500_sysctrl_read(u16 reg, u8 *value); int ab8500_sysctrl_write(u16 reg, u8 mask, u8 value); -void ab8500_restart(char mode, const char *cmd); #else