From patchwork Mon Feb 22 16:55:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylvain Lemieux X-Patchwork-Id: 8380311 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 45603C0553 for ; Mon, 22 Feb 2016 16:59:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5ED85204FC for ; Mon, 22 Feb 2016 16:58:59 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8AA2F204EB for ; Mon, 22 Feb 2016 16:58:58 +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 1aXtnf-0007UD-22; Mon, 22 Feb 2016 16:57:31 +0000 Received: from mail-ig0-x233.google.com ([2607:f8b0:4001:c05::233]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aXtmn-0006uD-JW for linux-arm-kernel@lists.infradead.org; Mon, 22 Feb 2016 16:56:39 +0000 Received: by mail-ig0-x233.google.com with SMTP id xg9so80851998igb.1 for ; Mon, 22 Feb 2016 08:56:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fYIzXG90zESbIlRYxa6zOgxv4z73ZIBWH0xBo/jgPu8=; b=KmtFpEjG8QZYGZdRAdlC6N3uXucJEi+WPi7z8hgIK54BG0pDXiOFrMZaB3xYdd7IzJ xWe5VsQEIdCTMndc0uueO6mE0xutizwrKyRmkzIqNWJ7MxqBaz7HiecSpiDjZZAOKaPg FVaMjFfoDVU4N6fs86Hf8rQMxUVGiqdP6TIujffXH+AQN3bfiySXRu2nIp0xVbla6gmy gKQQBE3PAVHbZ4y7FUjORgZDV5pWdNMrt/zzgcCRyD0bx5FcFpqy4SBKTDXeVVhJU1yn tY9wMsVsEMyTHlVpQRd+2NCgfG9hCpAA7IIAKk88kt+llTanunIvlL9kountICjG3cmU gEAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fYIzXG90zESbIlRYxa6zOgxv4z73ZIBWH0xBo/jgPu8=; b=h/5ZL8hOtndqbGIneHwJiJNLeXVZhtqSkVEP14pzaqqVUS9lHMYjSz+ClWKy6puEwp crkn0WUQwfA0AjT2rWe0/hL6Deb7SreXI5vGlaYt4TWt4LW5+cWj5MxOgEzsh4SQRDyq oj6dxk1eQpBFxcsMDnHdF0idkPImMUM6XZ6/skmzpqzoBqQ8GnOokWI7LzlWIcwwVAIH 4qo9kJY8++yZz4jE32rckhA+Y1EvtR+3z75N9KbATjQWwuAxqRbP6RULvvwV+Lq6vuKO xjv0ah4nsszbKHLH+kHs6icT3OWhMlO9JmvaQQXry04v1bTLk/ylOJdfQBd5o4nl18/u 9koA== X-Gm-Message-State: AG10YORpVKCth4leLoo1x44UgJPJpSW1ECU54WQMK06f60TTP7lNOZ2EsdoxlirAoOdKUQ== X-Received: by 10.50.114.196 with SMTP id ji4mr11725948igb.56.1456160176568; Mon, 22 Feb 2016 08:56:16 -0800 (PST) Received: from CABRO3AP00510.americas.tsp.ad ([74.51.240.241]) by smtp.gmail.com with ESMTPSA id x69sm11786084ioi.16.2016.02.22.08.56.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Feb 2016 08:56:15 -0800 (PST) From: slemieux.tyco@gmail.com To: linux-arm-kernel@lists.infradead.org, wim@iguana.be, manabian@gmail.com Subject: [PATCH v2 5/5] arm: lpc32xx: remove restart handler Date: Mon, 22 Feb 2016 11:55:43 -0500 Message-Id: <1456160143-26761-6-git-send-email-slemieux.tyco@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1456160143-26761-1-git-send-email-slemieux.tyco@gmail.com> References: <1456160143-26761-1-git-send-email-slemieux.tyco@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160222_085638_005887_38C6A9E6 X-CRM114-Status: GOOD ( 12.29 ) X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stigge@antcom.de, linux-watchdog@vger.kernel.org, linux@roeck-us.net, vz@mleia.com 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=-3.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_WEB, RP_MATCHES_RCVD, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 From: Sylvain Lemieux Remove the restart handler from "mach-lpc32xx"; this functionality is now available in the pnx4008 watchdog driver. Signed-off-by: Sylvain Lemieux --- Changes from v1 to v2: - new patch in v2. arch/arm/mach-lpc32xx/common.c | 15 --------------- arch/arm/mach-lpc32xx/common.h | 1 - arch/arm/mach-lpc32xx/phy3250.c | 1 - 3 files changed, 17 deletions(-) diff --git a/arch/arm/mach-lpc32xx/common.c b/arch/arm/mach-lpc32xx/common.c index 716e83e..5b7a1e7 100644 --- a/arch/arm/mach-lpc32xx/common.c +++ b/arch/arm/mach-lpc32xx/common.c @@ -194,21 +194,6 @@ void __init lpc32xx_map_io(void) iotable_init(lpc32xx_io_desc, ARRAY_SIZE(lpc32xx_io_desc)); } -void lpc23xx_restart(enum reboot_mode mode, const char *cmd) -{ - /* Make sure WDT clocks are enabled */ - __raw_writel(LPC32XX_CLKPWR_PWMCLK_WDOG_EN, - LPC32XX_CLKPWR_TIMER_CLK_CTRL); - - /* Instant assert of RESETOUT_N with pulse length 1mS */ - __raw_writel(13000, io_p2v(LPC32XX_WDTIM_BASE + 0x18)); - __raw_writel(0x70, io_p2v(LPC32XX_WDTIM_BASE + 0xC)); - - /* Wait for watchdog to reset system */ - while (1) - ; -} - static int __init lpc32xx_check_uid(void) { u32 uid[4]; diff --git a/arch/arm/mach-lpc32xx/common.h b/arch/arm/mach-lpc32xx/common.h index 1cd8853..2d90801 100644 --- a/arch/arm/mach-lpc32xx/common.h +++ b/arch/arm/mach-lpc32xx/common.h @@ -30,7 +30,6 @@ extern void lpc32xx_timer_init(void); extern void __init lpc32xx_init_irq(void); extern void __init lpc32xx_map_io(void); extern void __init lpc32xx_serial_init(void); -extern void lpc23xx_restart(enum reboot_mode, const char *); /* diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c index 77d6b1b..942bc3f 100644 --- a/arch/arm/mach-lpc32xx/phy3250.c +++ b/arch/arm/mach-lpc32xx/phy3250.c @@ -263,5 +263,4 @@ DT_MACHINE_START(LPC32XX_DT, "LPC32XX SoC (Flattened Device Tree)") .init_time = lpc32xx_timer_init, .init_machine = lpc3250_machine_init, .dt_compat = lpc32xx_dt_compat, - .restart = lpc23xx_restart, MACHINE_END