From patchwork Fri Jan 25 18:42:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 2046901 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id AE1293FDC4 for ; Fri, 25 Jan 2013 18:45:13 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TyoEw-0001fN-6R; Fri, 25 Jan 2013 18:43:02 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TyoEs-0001ed-CV for linux-arm-kernel@lists.infradead.org; Fri, 25 Jan 2013 18:42:59 +0000 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MH700MLI2NKMZJ0@mailout3.samsung.com> for linux-arm-kernel@lists.infradead.org; Sat, 26 Jan 2013 03:42:56 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.50]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 4F.D8.03880.032D2015; Sat, 26 Jan 2013 03:42:56 +0900 (KST) X-AuditID: cbfee61b-b7fb06d000000f28-52-5102d23059db Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 0F.D8.03880.032D2015; Sat, 26 Jan 2013 03:42:56 +0900 (KST) Received: from localhost.localdomain ([105.128.18.183]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MH700KOH2NFPP80@mmp1.samsung.com> for linux-arm-kernel@lists.infradead.org; Sat, 26 Jan 2013 03:42:56 +0900 (KST) From: Kukjin Kim To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH] ARM: EXYNOS: Fix crash on soft reset Date: Fri, 25 Jan 2013 10:42:11 -0800 Message-id: <1359139331-25220-1-git-send-email-kgene.kim@samsung.com> X-Mailer: git-send-email 1.7.10.4 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrJLMWRmVeSWpSXmKPExsVy+t8zI12DS0yBBlte8VpsenyN1YHRY/OS +gDGKC6blNSczLLUIn27BK6M49P/Mhes4Kp43fuOrYFxN0cXIweHhICJxLMpKV2MnECmmMSF e+vZuhi5OIQEljFKNBy4yAaRMJGYN/U8I0RiEaPEig0zWSCcDUwSp55vAqtiE9CQOPz+GTvI VBEBb4nl1xRBwswCeRKd7RvZQWxhAVOJSwtOM4LYLAKqEhuf9zGD2LwCrhJbdlxihVimKNH9 bALYFRICe9gkmrevY4ZoEJD4NvkQC8TVshKbDjBD1EtKHFxxg2UCo+ACRoZVjKKpBckFxUnp uUZ6xYm5xaV56XrJ+bmbGCEBJb2DcVWDxSFGAQ5GJR7eD3OZAoVYE8uKK3MPMUpwMCuJ8MqY AIV4UxIrq1KL8uOLSnNSiw8xJgMtn8gsJZqcDwz2vJJ4Q2NjEzMTUxNzS1NzU9KElcR5GU89 CRASSE8sSc1OTS1ILYLZwsTBKdXAGD/p8JxZX7/9F/VX+B0fLHOSYyb7tJjFCw7eUT4rzbbx e+/Ja2lmrcqbxLUtmyImLW7+ZSH3ft1U03l9f65d61k66S1DmOi5J5euh5f2T/rz5kDZldkT bBwFWAUatnbZhlh493/utZpgcG5vepGlIsPHh1FJJbzf/a467XnGb3Hb40rfpkMP3ZRYijMS DbWYi4oTAbdOYrZsAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkkeLIzCtJLcpLzFFi42I5/e+xgK7BJaZAg2dnOC02Pb7G6sDosXlJ fQBjVAOjTUZqYkpqkUJqXnJ+SmZeuq2Sd3C8c7ypmYGhrqGlhbmSQl5ibqqtkotPgK5bZg7Q VCWFssScUqBQQGJxsZK+HaYJoSFuuhYwjRG6viFBcD1GBmggYR1jxvHpf5kLVnBVvO59x9bA uJuji5GTQ0LARGLe1POMELaYxIV769m6GLk4hAQWMUqs2DCTBcLZwCRx6vkmNpAqNgENicPv n7F3MXJwiAh4Syy/pggSZhbIk+hs38gOYgsLmEpcWnAabCiLgKrExud9zCA2r4CrxJYdl1gh lilKdD+bwDaBkXsBI8MqRtHUguSC4qT0XCO94sTc4tK8dL3k/NxNjOCAfSa9g3FVg8UhRgEO RiUe3g9zmQKFWBPLiitzDzFKcDArifDKmACFeFMSK6tSi/Lji0pzUosPMSYDbZ/ILCWanA+M prySeENjEzMjSyMzCyMTc3PShJXEeRlPPQkQEkhPLEnNTk0tSC2C2cLEwSnVwLhi/uHJbpNT TinG3XaJt9p7Zh7XszMz5lRH1m/ZInZT9Rff89pDBz32z9RYEbxQxfK0tL2IgEfU94DI0xE+ M1+8aZjNcX/pgb37yznKnfOfTZv287OPztH0TYEcD900jnwpu/bZ8fyWS+YOP84X/HN8153a sJD31o9IqUxThSyZw7Gm3VKnvx9QYinOSDTUYi4qTgQAOlwqpZwCAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130125_134258_654845_35039A65 X-CRM114-Status: GOOD ( 10.02 ) X-Spam-Score: -7.6 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.33 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Girish K S , Thomas Abraham , Kukjin X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Thomas Abraham The soft-reset control register is located in the XMU controller space. Map this controller space before writing to the soft-reset controller register. Signed-off-by: Thomas Abraham Signed-off-by: Girish K S Signed-off-by: Kukjin --- arch/arm/mach-exynos/common.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index ed53a4f..b4d3188 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -294,6 +294,7 @@ void exynos4_restart(char mode, const char *cmd) void exynos5_restart(char mode, const char *cmd) { + struct device_node *np; u32 val; void __iomem *addr; @@ -301,8 +302,9 @@ void exynos5_restart(char mode, const char *cmd) val = 0x1; addr = EXYNOS_SWRESET; } else if (of_machine_is_compatible("samsung,exynos5440")) { - val = (0x10 << 20) | (0x1 << 16); - addr = EXYNOS5440_SWRESET; + np = of_find_compatible_node(NULL, NULL, "samsung,exynos5440-clock"); + addr = of_iomap(np, 0) + 0xcc; + val = (0xfff << 20) | (0x1 << 16); } else { pr_err("%s: cannot support non-DT\n", __func__); return;