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: 2739001 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 11F3FC0AB1 for ; Tue, 18 Jun 2013 06:30:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D0B8E20258 for ; Tue, 18 Jun 2013 06:30:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0481820198 for ; Tue, 18 Jun 2013 06:30:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752837Ab3FRGaW (ORCPT ); Tue, 18 Jun 2013 02:30:22 -0400 Received: from mail-pb0-f49.google.com ([209.85.160.49]:50819 "EHLO mail-pb0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752201Ab3FRGaV (ORCPT ); Tue, 18 Jun 2013 02:30:21 -0400 Received: by mail-pb0-f49.google.com with SMTP id jt11so3582822pbb.36 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=QTKDoxYSUVShTf/sTbtJNDv/iiLRVSBoaw/IUCAXfmoCU0v9lQ4A3oIeA/a3I+PIZs muOaUmln45FiO/H1MK30sh/kK4zkTo9Dwhk+GIP+iKcXOrLVyTEqqFq6/PTSAkt+mwT5 d21yuRpqr2NjPYZHYxDGHeaAJBYIBDsmgbRsZYtfcWrmd36T1vOzzzk7VjTINj7SpQJM 2axurSgtPifJXi48VrGf8jMrbSvYSSxst1H+d6kNKMtVK8sC68WPF6U9xTvoo/oKGw35 GOBoApmZzPa9j44msIL8jj9Vb1voUud5FSqQnZKktNjBiM2kow3HWKYd7HbQLDAT/TZH EHIA== 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 Cc: linux-samsung-soc@vger.kernel.org, linux-serial@vger.kernel.org, kgene.kim@samsung.com, t.figa@samsung.com, s.nawrocki@samsung.com, mark.rutland@arm.com, thomas.ab@samsung.com, Chander Kashyap 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: ALoCoQmQJvVWaybIIJZpcOCQ7pbpzFcl1J4A4LXTwhgY4+4GfpK38Paywyr4JoLtZ+N2nSFBCs6j Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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);