From patchwork Fri Jun 14 14:02:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chander Kashyap X-Patchwork-Id: 2722011 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 EBF869F967 for ; Fri, 14 Jun 2013 14:58:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CE34120305 for ; Fri, 14 Jun 2013 14:58:01 +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 C08E3202F9 for ; Fri, 14 Jun 2013 14:58:00 +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 1UnUfj-0001w9-8K; Fri, 14 Jun 2013 14:08:13 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UnUdl-0000Oj-CR; Fri, 14 Jun 2013 14:06:09 +0000 Received: from mail-pb0-x22c.google.com ([2607:f8b0:400e:c01::22c]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UnUc1-0000C5-HY for linux-arm-kernel@lists.infradead.org; Fri, 14 Jun 2013 14:04:28 +0000 Received: by mail-pb0-f44.google.com with SMTP id uo1so606159pbc.17 for ; Fri, 14 Jun 2013 07:04:00 -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=w3O8EDLjFxlYyeLEe4xwNN21EJp9HVI/Ayy3yNnOws8=; b=ljIv6E/Y2QSrR1wRLiJjq6CngmlG9yIYjqpeFW92jk5DG3JB5k3YMbOltdJ+AoVGWN 2gn/oUILgxhuEbNNK2I4k/BoBwoAwNcInRdgYKr4toGaUUkvYROxRF7XcFHRJn4aXX8y BYw+MmRQ1C5l1ma6mDasp8Lun02plF3AEqjgYVEEczPDECT/zDwyByjj4dPEWS84B/xj zbWFXk/GVFu04Max024fR0BJr62/9d81iEeGEWiboogPX3Yf+I1+VmzSLigKkKMKXzzr W2dDmafbP+AxPaVREanDMLSUrwLFZoUbmbeovHkulb2yRgC0y88mBCpJDPN22DaSA+tt aC4w== X-Received: by 10.66.255.41 with SMTP id an9mr2695238pad.44.1371218640005; Fri, 14 Jun 2013 07:04:00 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPSA id ri8sm2452804pbc.3.2013.06.14.07.03.56 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 14 Jun 2013 07:03:59 -0700 (PDT) From: Chander Kashyap To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 10/10] ARM: Exynos: extend soft-reset support for Exynos5420 Date: Fri, 14 Jun 2013 19:32:52 +0530 Message-Id: <1371218572-8993-11-git-send-email-chander.kashyap@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1371218572-8993-1-git-send-email-chander.kashyap@linaro.org> References: <1370516488-25860-10-git-send-email-chander.kashyap@linaro.org> <1371218572-8993-1-git-send-email-chander.kashyap@linaro.org> X-Gm-Message-State: ALoCoQkK+/qQ4UusWY5p6fbtAdDZozwepWVM05JqfVzwde+lQUzjvdhQ9Q5o7XEudjUzNM8SE9nH X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130614_100421_731419_9BD161B1 X-CRM114-Status: GOOD ( 10.90 ) 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=-4.5 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. 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);