From patchwork Fri Mar 4 18:44:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylvain Lemieux X-Patchwork-Id: 8507081 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 C8CAF9F38C for ; Fri, 4 Mar 2016 18:47:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D9A152014A for ; Fri, 4 Mar 2016 18:47:35 +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 122A620165 for ; Fri, 4 Mar 2016 18:47:35 +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 1abuje-0000ZZ-DQ; Fri, 04 Mar 2016 18:45:58 +0000 Received: from mail-io0-x242.google.com ([2607:f8b0:4001:c06::242]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1abuik-00078r-GX for linux-arm-kernel@lists.infradead.org; Fri, 04 Mar 2016 18:45:04 +0000 Received: by mail-io0-x242.google.com with SMTP id m184so5748384iof.3 for ; Fri, 04 Mar 2016 10:44:43 -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=oBw2UCiQP5fUuwGIHRKU2+aKDEmk4m4j1046iBN4r5M=; b=gXoCViwROwTHJiRXXBaV2Azn3ReJCkSUpXgFM73se2TITPsrF2RmJrLtz+Q9iHsD9t M+UW0At5Zul0Pr3CwHLTo6GZOjJVc/OmYxxrfUrcYrdi+H0JXXCnql/cFY5ShWjSQXAv 6ABnoxEmuyIKek1/gV8UrTXVUadHg7ykLW5ZmY7aEq2O2nfmwr7nE2/hp1fq6j1ppsmN biJ987v9vabJpuPclyD6N98NLRTo+Ierehx0KvrqkbmZmO7HsSY0l0UksKDV2FYVFaql XGygHuw6VnsGc18nv8r/2B3gtM/V8nMTll/uGcENQyEXA74kqR2Ouq3fvIjf+SAjdYVv j6VA== 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=oBw2UCiQP5fUuwGIHRKU2+aKDEmk4m4j1046iBN4r5M=; b=VNx3m8KnEOQGpY4SNS8GeBbgyhbwnlwGkhtDCCJnBMdu86cr8NzLNn3IxbPO30Y1Bf i+7AMYJIIR0xybFm6KCiCd259xuG4JCREbnbqeIlMQ+3qlhLbAMnuEmJsSMIRqbw9u7B BhMKiD3jUGsmJYXTirCsQPrtepG3S0Ugnsei5O7IlVyNycdHl6gx7fFhEsMbjwjdm4k0 uYAYx6QaU4UxZx0PV2zU6eZBNTzZ9DmMuALDPPk8KIxSAsllQcDOcVN4ZOhUGyqu6x3K 8E3y+L0LJfsroTa+FrZ+Y4RuRQDyhfHMTEESzoGAlIrmtRNocRJyEJWj+OroKtvs6026 yjag== X-Gm-Message-State: AD7BkJKPz+M14HXEN8/5vMhti39tYTJbtTUc3VLpzyqcOmiXboMV/GH1Pg8QgAR72dgdxw== X-Received: by 10.107.26.201 with SMTP id a192mr10052210ioa.13.1457117083250; Fri, 04 Mar 2016 10:44:43 -0800 (PST) Received: from CABRO3AP00510.americas.tsp.ad ([74.51.240.241]) by smtp.gmail.com with ESMTPSA id nh19sm146470igb.2.2016.03.04.10.44.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Mar 2016 10:44:41 -0800 (PST) From: Sylvain Lemieux To: linux-arm-kernel@lists.infradead.org, arnd@arndb.de, linux@roeck-us.net, manabian@gmail.com Subject: [PATCH v7 6/6] arm: lpc32xx: remove restart handler Date: Fri, 4 Mar 2016 13:44:10 -0500 Message-Id: <1457117050-13543-7-git-send-email-slemieux.tyco@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1457117050-13543-1-git-send-email-slemieux.tyco@gmail.com> References: <1457117050-13543-1-git-send-email-slemieux.tyco@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160304_104502_874387_238FC29A X-CRM114-Status: GOOD ( 12.08 ) 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, wim@iguana.be, linux-watchdog@vger.kernel.org, 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 Acked-by: Guenter Roeck --- Changes from v6 to v7: - none. Changes from v5 to v6: - none. Changes from v4 to v5: - none. 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 *); /*