From patchwork Fri Jun 24 10:49:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 640143 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rbZq93ZdZz9t12 for ; Fri, 24 Jun 2016 20:50:13 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bGOfH-0004l3-KT; Fri, 24 Jun 2016 10:48:47 +0000 Received: from mout.kundenserver.de ([217.72.192.73]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bGOfD-0004dE-B4 for linux-arm-kernel@lists.infradead.org; Fri, 24 Jun 2016 10:48:44 +0000 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0M0iAY-1bVR6D2DZm-00ur72; Fri, 24 Jun 2016 12:48:11 +0200 From: Arnd Bergmann To: Shawn Guo Subject: [PATCH 1/6] ARM: imx: remove cpu_is_mx1 check Date: Fri, 24 Jun 2016 12:49:56 +0200 Message-Id: <20160624105001.3166287-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160624105001.3166287-1-arnd@arndb.de> References: <20160624105001.3166287-1-arnd@arndb.de> X-Provags-ID: V03:K0:YIpZNbjzRhtX0RbC06qNJTiuRKUJI+QREQNC2DjfY8YBiUTOyex 1/3tUwJ6VfoR22uzqVklTXPwx+VLQPtt0adM6Fdzx5rpV82tEgLwZqc/i18lzsPex75vNMl tn6YAC6SNusB8LpyHIhiJ7dX4bd/ZsGvK6zMElWc1ubphE7NgSo4wYc34xnmJ1+8v5Zvb1p d52+lwfzr156ZEsGrtZkw== X-UI-Out-Filterresults: notjunk:1; V01:K0:iP0vggEP1xU=:JYgUT1GgZHTI64htyKqNeS lHpjrvEbjeLHzW5WjJCaZXJxPuvo8q2TKo/Y7Mi3IVw2fKvveCpneuv76cFIc0mMpAJzla9e4 rVqNtLUbkQIut0K0168YJTLnyF1s7joDA7eiqDdF4ab8DzmV6TLm8jhvGKE4/MWsoi79Ftuuq XiQco4JG9Lrw8xmcfFsRqzfaEOJDwKwgBNHOKWjF3pGScdZajdIGC2yUQvX0NKJ9zqC7s9sXy ARF1LcOpxtuw02+gTNP3TnFaAohNJ6UqcM+QxVU+fi4zfCgZoMyu1KlGCrs/hzrN/sTI/CpPi XUkt0SlZUwmCORfgjpwnzKmv/kpBIkvu/5tZ2DQHeOl6UtAJ8zFlu6mRpa3f1jTFhmOdQ4ylt Ss3U6q0vwTNCMrKK/f3iUVMyJTqWzMYILPktizIMaUzrecnxfsiSMHWEcKLnsonfDoRFk3HFD yDYEhVgR97ZuKMpnUdBrXJ/k3Fi/a24D4+Y7uQrm6I2SeC8iUNCdCKAdUOtCYBnMvcaUafAmb uHQaM9+/UWfTnpbaYr5+9D9u2RPMD2nnn0oICOB6IOhzmm2zfcUUkEi0OB+2qCKdWcjYNSqA+ 0Ec3o3r7VBZQZyvbprUR2JKxTJCq5tklJRb1PipdJfv921KxEaIvwnkzTHeDafpFOreuDdY5/ W+KVd/EnbiRzX1vjYkbKbFUedVYCSewytc3gy4VkUQrvo5q1lSgj+XUYs25jTbpeoClg= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160624_034843_741555_3570F8BB X-CRM114-Status: GOOD ( 13.72 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [217.72.192.73 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [217.72.192.73 listed in wl.mailspike.net] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabio Estevam , Arnd Bergmann , Sascha Hauer , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org There is only one call site for this, and it's easily replaced by initializing the reset value at boot time. Signed-off-by: Arnd Bergmann --- arch/arm/mach-imx/common.h | 1 + arch/arm/mach-imx/mm-imx1.c | 2 +- arch/arm/mach-imx/system.c | 16 +++++++++------- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h index 60d9ae63f76e..0a1d1f175b7a 100644 --- a/arch/arm/mach-imx/common.h +++ b/arch/arm/mach-imx/common.h @@ -54,6 +54,7 @@ struct platform_device *mxc_register_gpio(char *name, int id, void mxc_set_cpu_type(unsigned int type); void mxc_restart(enum reboot_mode, const char *); void mxc_arch_reset_init(void __iomem *); +void imx1_reset_init(void __iomem *); void imx_set_aips(void __iomem *); void imx_aips_allow_unprivileged_access(const char *compat); int mxc_device_init(void); diff --git a/arch/arm/mach-imx/mm-imx1.c b/arch/arm/mach-imx/mm-imx1.c index e065fedb3ad4..9a42f19be81e 100644 --- a/arch/arm/mach-imx/mm-imx1.c +++ b/arch/arm/mach-imx/mm-imx1.c @@ -50,7 +50,7 @@ void __init mx1_init_irq(void) void __init imx1_soc_init(void) { - mxc_arch_reset_init(MX1_IO_ADDRESS(MX1_WDT_BASE_ADDR)); + imx1_reset_init(MX1_IO_ADDRESS(MX1_WDT_BASE_ADDR)); mxc_device_init(); mxc_register_gpio("imx1-gpio", 0, MX1_GPIO1_BASE_ADDR, SZ_256, diff --git a/arch/arm/mach-imx/system.c b/arch/arm/mach-imx/system.c index e442ed7f7ff5..c06af650e6b1 100644 --- a/arch/arm/mach-imx/system.c +++ b/arch/arm/mach-imx/system.c @@ -34,25 +34,19 @@ static void __iomem *wdog_base; static struct clk *wdog_clk; +static int wcr_enable = (1 << 2); /* * Reset the system. It is called by machine_restart(). */ void mxc_restart(enum reboot_mode mode, const char *cmd) { - unsigned int wcr_enable; - if (!wdog_base) goto reset_fallback; if (!IS_ERR(wdog_clk)) clk_enable(wdog_clk); - if (cpu_is_mx1()) - wcr_enable = (1 << 0); - else - wcr_enable = (1 << 2); - /* Assert SRS signal */ imx_writew(wcr_enable, wdog_base); /* @@ -89,6 +83,14 @@ void __init mxc_arch_reset_init(void __iomem *base) clk_prepare(wdog_clk); } +#ifdef CONFIG_SOC_IMX1 +void __init imx1_reset_init(void __iomem *base) +{ + wcr_enable = (1 << 0); + mxc_arch_reset_init(base); +} +#endif + #ifdef CONFIG_CACHE_L2X0 void __init imx_init_l2cache(void) {