From patchwork Tue Jun 18 06:29:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chander Kashyap X-Patchwork-Id: 2739731 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 87B2C9F472 for ; Tue, 18 Jun 2013 07:40:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 621BB201AD for ; Tue, 18 Jun 2013 07:40:39 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A06212025E for ; Tue, 18 Jun 2013 07:40:37 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UopTo-00045M-Qr; Tue, 18 Jun 2013 06:33:28 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UopSF-0005jB-RO; Tue, 18 Jun 2013 06:31:47 +0000 Received: from mail-pd0-f177.google.com ([209.85.192.177]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UopRC-0005cO-DO for linux-arm-kernel@lists.infradead.org; Tue, 18 Jun 2013 06:30:43 +0000 Received: by mail-pd0-f177.google.com with SMTP id p10so3548289pdj.22 for ; Mon, 17 Jun 2013 23:30:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=Dy+6oL4AVV5bzHw0xqHErlfV8cuqZRlwCYBy3fDzoAM=; b=auPRarDrGPvKM52zDckUAPG0RvVpxcCBfSTqbQ2j4t0aBBAbble/L4FZcBUuEheHsW ScpkJXOgvzuTHC67h5/q8+UVTknscCVJ3XuUQLjROJblx8pOjA72fsITzo5Mll9wjws6 b2hcAHeroLIMyWRzJh3Czmc+p7uKUWFI7hZd6/pSHz8CxSepuBRLSFk099esA7j2970s 6Oe2p9Zf3c47Gv6N4rKa5wn6Khydq/87+TOwYAUmd7UIDCDrRNtDZ56365J/E3Ivh/YC lkXPrVUrGHfei24kOY3ApOrlwJg1Ei2g2GDJyJbH3ZGJfjAV5xkPADZ1vBmLjCgOPOdW bYeg== X-Received: by 10.66.160.1 with SMTP id xg1mr903569pab.25.1371537021004; Mon, 17 Jun 2013 23:30:21 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPSA id ep3sm7967227pbd.27.2013.06.17.23.30.17 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Jun 2013 23:30:20 -0700 (PDT) From: Chander Kashyap To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 10/10] ARM: Exynos: extend soft-reset support for Exynos5420 Date: Tue, 18 Jun 2013 11:59:22 +0530 Message-Id: <1371536962-13322-11-git-send-email-chander.kashyap@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1371536962-13322-1-git-send-email-chander.kashyap@linaro.org> References: <1371536962-13322-1-git-send-email-chander.kashyap@linaro.org> X-Gm-Message-State: ALoCoQkMSpnXXth3YKhSoNfNj8bxL48EQlNPmzprM5j7zZAIKY2ExgL576yQ/qSu5sB1SQw9wudg X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130618_023042_586834_3E8A9E32 X-CRM114-Status: GOOD ( 10.50 ) X-Spam-Score: -1.9 (-) Cc: mark.rutland@arm.com, kgene.kim@samsung.com, linux-serial@vger.kernel.org, t.figa@samsung.com, Chander Kashyap , linux-samsung-soc@vger.kernel.org, thomas.ab@samsung.com, s.nawrocki@samsung.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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=-5.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Extend the soft reset support for Exynos5420 SoC. Reviewed-by: Tomasz Figa Signed-off-by: Chander Kashyap --- arch/arm/mach-exynos/common.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index 6f435da..4e6c227 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -330,10 +330,10 @@ void exynos5_restart(char mode, const char *cmd) u32 val; void __iomem *addr; - if (of_machine_is_compatible("samsung,exynos5250")) { - val = 0x1; - addr = EXYNOS_SWRESET; - } else if (of_machine_is_compatible("samsung,exynos5440")) { + val = 0x1; + addr = EXYNOS_SWRESET; + + if (of_machine_is_compatible("samsung,exynos5440")) { u32 status; np = of_find_compatible_node(NULL, NULL, "samsung,exynos5440-clock"); @@ -344,9 +344,6 @@ void exynos5_restart(char mode, const char *cmd) val = __raw_readl(addr); val = (val & 0xffff0000) | (status & 0xffff); - } else { - pr_err("%s: cannot support non-DT\n", __func__); - return; } __raw_writel(val, addr);