From patchwork Thu Feb 25 18:31:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylvain Lemieux X-Patchwork-Id: 8425841 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8E4D49F52D for ; Thu, 25 Feb 2016 18:36:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BD0B5202B8 for ; Thu, 25 Feb 2016 18:36:07 +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 D379A201BC for ; Thu, 25 Feb 2016 18:36:06 +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 1aZ0k3-0002Iv-Ld; Thu, 25 Feb 2016 18:34:23 +0000 Received: from mail-io0-x243.google.com ([2607:f8b0:4001:c06::243]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aZ0i6-0000XE-3E for linux-arm-kernel@lists.infradead.org; Thu, 25 Feb 2016 18:32:24 +0000 Received: by mail-io0-x243.google.com with SMTP id b188so6393887iof.3 for ; Thu, 25 Feb 2016 10:32:03 -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=8w1CmXmgsr0BXR1tFhz+wl24vknR9m0F/Xg/ctD0Yac=; b=dGe9PLIn4JlZluqDc7A0msQiDJbki30VMuUPxmCgNRBSsUg+dFbe61BnOYR9xosrqX 3IYZ4eLV+OQYSQOkR5AVZsdvMruJD5mMm0gxxBhmAhlnY1/Q+oi+o2nBjp/T8VyCP0mq 3h1CdqMIlbQkbzEL1Zw4YsLaNnYiZ53T89Mar3sWr6Lbpp1yq4RdbJvnkFOq4NhrJueM DQ4mZY1//vboPgEM7wYulrtfHKXXinSXqCzXLeuvE+9lALkEkq6UQyehdI6OOdTH9b5U IMi/YXsHTkNYP3Dld4cO0xMkyQS4TV92BHNfNv4zIdLbx9uDgSgnkJ9+ywOmvTZRhTTk /l5g== 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=8w1CmXmgsr0BXR1tFhz+wl24vknR9m0F/Xg/ctD0Yac=; b=EK5Xqjagw/4Pr0VN0LChgJgZaWwjxYKs0VmEt3LhfCfwRTsUwSogGCJ9avT3M9OBJy 43CnSdEbl/US0ze0g67ej3aaM61D6rrB4W+hg2R3KOhJ/LID42XEc6v5c/ueAqGBjzae b5BExL5PRXlsLVElRFIAOii5b4lSsTE6Nk3L/j4m6IiUWa6/f+4oqX0PZvhQbD/WpwkN opFtFFtvz1+DZwlQOxmHRApB/4RyV765zhjxUfwlNzzg3ugFYOVWkIynY9vqmf/V6tdl S8B/wqx/bt31y2w4DyTvoBSmKy8JIQsF12v6uT0qsM7LyQv5VrU68RbKLal42oC2UvQT CGLw== X-Gm-Message-State: AG10YORTKBZDyJnCR96mnxCsVcMR33W2eLj4bYNoO2ykE/3NWPkL+fl/9QFMGkeWnxTNjw== X-Received: by 10.107.38.82 with SMTP id m79mr4300844iom.2.1456425123200; Thu, 25 Feb 2016 10:32:03 -0800 (PST) Received: from CABRO3AP00510.americas.tsp.ad ([74.51.240.241]) by smtp.gmail.com with ESMTPSA id qa4sm1736299igb.14.2016.02.25.10.32.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Feb 2016 10:32:01 -0800 (PST) From: Sylvain Lemieux To: linux-arm-kernel@lists.infradead.org, arnd@arndb.de, wim@iguana.be, manabian@gmail.com Subject: [PATCH v4 6/6] arm: lpc32xx: remove restart handler Date: Thu, 25 Feb 2016 13:31:40 -0500 Message-Id: <1456425100-28136-7-git-send-email-slemieux.tyco@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1456425100-28136-1-git-send-email-slemieux.tyco@gmail.com> References: <1456425100-28136-1-git-send-email-slemieux.tyco@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160225_103222_559888_CF02B944 X-CRM114-Status: GOOD ( 12.11 ) X-Spam-Score: -1.2 (-) 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=-1.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_SORBS_WEB, 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 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 v3 to v4: - Switch patch #5 and #6 order. Changes from v2 to v3: - move the change to "phy3250.c" into a separate patch. Changes from v1 to v2: - new patch in v2. arch/arm/mach-lpc32xx/common.c | 15 --------------- arch/arm/mach-lpc32xx/common.h | 1 - 2 files changed, 16 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 *); /*