From patchwork Wed Feb 24 17:46:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylvain Lemieux X-Patchwork-Id: 8410451 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 C96079F52D for ; Wed, 24 Feb 2016 17:50:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E460A2025B for ; Wed, 24 Feb 2016 17:50:32 +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 0E05320225 for ; Wed, 24 Feb 2016 17:50:32 +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 1aYdYc-0002uP-TV; Wed, 24 Feb 2016 17:49:02 +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 1aYdXG-0001nj-Pw for linux-arm-kernel@lists.infradead.org; Wed, 24 Feb 2016 17:47:40 +0000 Received: by mail-io0-x243.google.com with SMTP id l127so3214412iof.1 for ; Wed, 24 Feb 2016 09:47:21 -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=OYm/NCfoZPJd+xKPUGCKeb8D0CTiWV0jBm9UMZB44Ak=; b=pm+/USrI+rov1XEnO1fXfXGI20jK/vN5CEGBh461yZpdeMH64OLsCpFOVIjQfQjXO6 Lkc7VV1ql6dwuCdB/wgOjuzXWRXcfiw7l3szKHEKNkobmMRV1G7oHrm2rsHjG36Ffrgh ZX6yciH2ShBs0udvpjmfUuI9mWDKSATPXtNge1K2/WAHBV3XboMpIAD00pSyRHzOXBHr CNt2NHmoexpbwNyj3SyYk09aSMOxML3pDQQSo7Qqr2MnOeZLVfGU29dogLYMzs79cSFz 0WxWW8nPZYXm4zM+98TG7eIAwyOiC8koKKQc4BuEEno8tZPx6FHCP0YioPC8E09l56BX MPxQ== 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=OYm/NCfoZPJd+xKPUGCKeb8D0CTiWV0jBm9UMZB44Ak=; b=LdZVW5Ujv4aKyj/uUKW+i8uxFj6WIqvMWGfznPB5B/eC0a5HmjYC56+R5gw3Hz3E4S JN1mWBJwGfpAwe58tj8AteejEDBWNB4++oITzDRQ9DSimQkDm504tJ2X9y4Lb9WNaA1V X5RST4UNKU2IPi+r59CcqVj1udH2X5DS7tn/6sRkcDlPoEyhWgzfPaWQzpuJzGhz/i14 VbqXQBtoj3w+7BpUfhtylYGAFEnVYm/jmLKsyemV1ycK99FfE3O23fwhin1nzCZTzjCk ak37RWrUZ/9UnRQI/iM39xQgb8LzWcj2byYTlEY2jkHeJ2HZpsQ78sQbbNot5e6p1mWu e9Qg== X-Gm-Message-State: AG10YORP+lOTp+DiopGPGmm84Tb26waLStEj7gpNhhfvqqKiHkYdl0Mvb2Vf+HjEIJZ6Kg== X-Received: by 10.50.28.50 with SMTP id y18mr1369460igg.12.1456336041352; Wed, 24 Feb 2016 09:47:21 -0800 (PST) Received: from CABRO3AP00510.americas.tsp.ad ([74.51.240.241]) by smtp.gmail.com with ESMTPSA id pk7sm13494524igb.17.2016.02.24.09.47.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Feb 2016 09:47:20 -0800 (PST) From: Sylvain Lemieux To: linux-arm-kernel@lists.infradead.org, wim@iguana.be, manabian@gmail.com Subject: [PATCH v3 5/6] arm: lpc32xx: remove restart handler Date: Wed, 24 Feb 2016 12:46:57 -0500 Message-Id: <1456336018-6620-6-git-send-email-slemieux.tyco@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1456336018-6620-1-git-send-email-slemieux.tyco@gmail.com> References: <1456336018-6620-1-git-send-email-slemieux.tyco@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160224_094739_150414_D99E019C X-CRM114-Status: GOOD ( 12.01 ) 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 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 *); /*