From patchwork Mon Jun 17 11:00:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chander Kashyap X-Patchwork-Id: 2732711 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 BC1B2C0AB1 for ; Mon, 17 Jun 2013 11:01:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 21E1920283 for ; Mon, 17 Jun 2013 11:01:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 056CC20264 for ; Mon, 17 Jun 2013 11:01:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932735Ab3FQLBh (ORCPT ); Mon, 17 Jun 2013 07:01:37 -0400 Received: from mail-pd0-f172.google.com ([209.85.192.172]:47147 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932674Ab3FQLBg (ORCPT ); Mon, 17 Jun 2013 07:01:36 -0400 Received: by mail-pd0-f172.google.com with SMTP id z10so2670758pdj.17 for ; Mon, 17 Jun 2013 04:01:36 -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=lPQVEDJ1BIkXWG6k9UbzIXQ1pJH3shIKKPUQhZA46F+pabNE/DoYIDq8r/n9coQTfb SWCqVW4aAUStcWoDTDJaC+yx+AnsKpTlRI87Ba2jf0zynJnmaFNuTJV7KYuYgU/p8TwH gQ++YiSGGkwml/a3RhgFbvXs7y1UUb6lF7a1cVdvUl4a3EyWBlbm+Tl0ZslvDsvglp43 nZU/bZfTBShEY7Hsk6tMF7l+sSzxPxeWJ89FQdlNhRD7rY6E+bcG5JhtblW1LQ0Z77eR FwTC8T9be09a0rTl9kneSFiDL4kEEPhrlHpHydmSWqU19h5Fcm23+bP1OPy4UOEe3T1b iyLQ== X-Received: by 10.66.193.199 with SMTP id hq7mr12609699pac.183.1371466896207; Mon, 17 Jun 2013 04:01:36 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPSA id ep3sm4547645pbd.27.2013.06.17.04.01.31 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Jun 2013 04:01:35 -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 v3 10/10] ARM: Exynos: extend soft-reset support for Exynos5420 Date: Mon, 17 Jun 2013 16:30:35 +0530 Message-Id: <1371466836-4111-11-git-send-email-chander.kashyap@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1371466836-4111-1-git-send-email-chander.kashyap@linaro.org> References: <1371466836-4111-1-git-send-email-chander.kashyap@linaro.org> X-Gm-Message-State: ALoCoQmhIFf1fQwcs6XS/khzb/gY3EKOIwhi5DELq5/uhUqo0cjQbHEuf35lZxADLweSVGdCu9Kn 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.0 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. 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);