From patchwork Mon Jan 25 08:30:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 60274 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1221774lbb; Mon, 25 Jan 2016 00:33:16 -0800 (PST) X-Received: by 10.66.216.69 with SMTP id oo5mr23595206pac.126.1453710795003; Mon, 25 Jan 2016 00:33:15 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id rm10si32126412pab.25.2016.01.25.00.33.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Jan 2016 00:33:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dkim=neutral (body hash did not verify) header.i=@linaro.org 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 1aNcYb-0002EM-Kf; Mon, 25 Jan 2016 08:31:29 +0000 Received: from mail-lb0-x236.google.com ([2a00:1450:4010:c04::236]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aNcYX-0002D7-N9 for linux-arm-kernel@lists.infradead.org; Mon, 25 Jan 2016 08:31:26 +0000 Received: by mail-lb0-x236.google.com with SMTP id oh2so69780035lbb.3 for ; Mon, 25 Jan 2016 00:31:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=LIstiqq4hCMB1AjkJOXgPxZDtI6a7sjsUvM8oHqhzrU=; b=TK6SaNMGIYanCBAJ8szcK1B1s8cWZONbZ6J7O5CgpFRM2LFlpauXUpbR7x3jT35Wkj 1Bt8Me6t/fGgkgpPdg3qWQ/pL5cy5fVvR1VWg+cdgC6lgpZ/gUsFNmF+idCOm2eYABbV UeSmSWFtsEqpAF1Z2n0DIF/7W4XaJj9oIHL44= 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; bh=LIstiqq4hCMB1AjkJOXgPxZDtI6a7sjsUvM8oHqhzrU=; b=S1F4yNTJ9q2jW/96v9h0HIahw3p+AeWsAlYxEBdXCmDUA8cWohFUxelrwBKYkPFpyQ cGHlMlCOhovLqeS3oqEvOpN6/nSEDA0X70bonO5rgTmCln0IJDhMCUMH7Dl+hsBvSLxJ HqpcysThzHoRpak4t6BqZd64tvppTW1RdMs6QdfJvCPNAMR3cW/TuJ5hG/AREYbJQf6B HS4NKDA/7zwkqnn39nQX4z+yJfIbX88wXntADmezyUvWRDnNowbY+wTo2nPLm6BJ7vJX UIqLfRmqliOOhPxs3bbDzJ5Wm2necs5N0SHoDl5K8O0LTO+ykHJpI29iH6iFNWE1Hobz LN9w== X-Gm-Message-State: AG10YORcE6TnttmGuRyVH9QzQqEVaBWAGc3u4FJVz9kII07S1jCh70+TA9F1YXhjo7EDVzIv X-Received: by 10.112.126.72 with SMTP id mw8mr5918288lbb.14.1453710663228; Mon, 25 Jan 2016 00:31:03 -0800 (PST) Received: from localhost.localdomain ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id rx3sm2504012lbb.35.2016.01.25.00.31.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Jan 2016 00:31:02 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] ARM: versatile: move restart to the device tree Date: Mon, 25 Jan 2016 09:30:56 +0100 Message-Id: <1453710656-14280-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160125_003125_944426_E349B7A8 X-CRM114-Status: GOOD ( 16.42 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:4010:c04:0:0:0:236 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 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: Dmitry Eremin-Solenikov , Linus Walleij , David Woodhouse , Sebastian Reichel MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org We have a power/reset driver for the Versatile family in drivers/power/reset so let's just activate that driver and use it and get rid of some non-DT remnants. Cc: Sebastian Reichel Cc: Dmitry Eremin-Solenikov Cc: David Woodhouse Cc: Rob Herring Signed-off-by: Linus Walleij --- arch/arm/mach-versatile/Kconfig | 3 +++ arch/arm/mach-versatile/versatile_dt.c | 13 ------------- 2 files changed, 3 insertions(+), 13 deletions(-) -- 2.4.3 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel Acked-by: Arnd Bergmann Acked-By: Sebastian Reichel diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig index e40f777ccf7d..b0cc26284fc9 100644 --- a/arch/arm/mach-versatile/Kconfig +++ b/arch/arm/mach-versatile/Kconfig @@ -8,8 +8,11 @@ config ARCH_VERSATILE select COMMON_CLK_VERSATILE select CPU_ARM926T select ICST + select MFD_SYSCON select MIGHT_HAVE_PCI select PLAT_VERSATILE + select POWER_RESET + select POWER_RESET_VERSATILE select VERSATILE_FPGA_IRQ help This enables support for ARM Ltd Versatile board. diff --git a/arch/arm/mach-versatile/versatile_dt.c b/arch/arm/mach-versatile/versatile_dt.c index c44871851255..cf8a4ea6311a 100644 --- a/arch/arm/mach-versatile/versatile_dt.c +++ b/arch/arm/mach-versatile/versatile_dt.c @@ -345,18 +345,6 @@ static void __init versatile_init_early(void) __io_address(VERSATILE_SCTL_BASE)); } -static void versatile_restart(enum reboot_mode mode, const char *cmd) -{ - u32 val; - - val = readl(versatile_sys_base + VERSATILE_SYS_RESETCTL_OFFSET); - val |= 0x105; - - writel(0xa05f, versatile_sys_base + VERSATILE_SYS_LOCK_OFFSET); - writel(val, versatile_sys_base + VERSATILE_SYS_RESETCTL_OFFSET); - writel(0, versatile_sys_base + VERSATILE_SYS_LOCK_OFFSET); -} - static void __init versatile_dt_pci_init(void) { u32 val; @@ -420,5 +408,4 @@ DT_MACHINE_START(VERSATILE_PB, "ARM-Versatile (Device Tree Support)") .init_early = versatile_init_early, .init_machine = versatile_dt_init, .dt_compat = versatile_dt_match, - .restart = versatile_restart, MACHINE_END