From patchwork Sun Feb 16 23:15:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Bedia X-Patchwork-Id: 3659041 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 56A4D9F2EC for ; Sun, 16 Feb 2014 23:17:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8DF84201EF for ; Sun, 16 Feb 2014 23:17:05 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 92F4D201E4 for ; Sun, 16 Feb 2014 23:17:04 +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 1WFAwl-00024T-Nm; Sun, 16 Feb 2014 23:16:27 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WFAwj-0001fB-B5; Sun, 16 Feb 2014 23:16:25 +0000 Received: from mail-yh0-f41.google.com ([209.85.213.41]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WFAwf-0001ee-Ni for linux-arm-kernel@lists.infradead.org; Sun, 16 Feb 2014 23:16:22 +0000 Received: by mail-yh0-f41.google.com with SMTP id f73so13812170yha.0 for ; Sun, 16 Feb 2014 15:15:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=iNYUjrtKMhxjpzxOqp/qp/kPTA/NiVGYdUzYUwLTWzc=; b=lpVkRslW6ZU2no4CY5AmMomBsZrDmQkljuSLSvlZR0F2KXlrU7adn/v/mJCQ3Fjxmg joWtquYtagvvYtUjjMOjRwiVZmPhuqNIEW/NsFXiKfuJ00WJDtCrnLODug6zPqyAme3u QNyekCEQ2B7slM5afT1e/afPs1zasvuDjY7pFriMolX0NpFdUNMpUGX0btSf7VUKXYts u1vD1FGArsqv03YLuRHGYBdsM0Sl08QNMGKu8JdjQQmF8NHcrfcVv9biyuhAo0pxqGVU 4lrmxgAHC6U5IVlPy8OuRw/hJ0DGh3gaI3/bzBjWvYleI+l3I1zrzkCgXz7jPZ+uQkN6 9J1Q== X-Received: by 10.236.44.34 with SMTP id m22mr11217009yhb.9.1392592552797; Sun, 16 Feb 2014 15:15:52 -0800 (PST) Received: from vaibhav-VirtualBox.lawn.gatech.edu (lawn-128-61-55-215.lawn.gatech.edu. [128.61.55.215]) by mx.google.com with ESMTPSA id n6sm42601691yha.20.2014.02.16.15.15.52 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 16 Feb 2014 15:15:52 -0800 (PST) From: Vaibhav Bedia To: tony@atomide.com, rnayak@ti.com, paul@pwsan.com Subject: [PATCH 1/1] ARM: OMAP5: Fix reboot handling Date: Sun, 16 Feb 2014 18:15:44 -0500 Message-Id: <1392592544-7884-1-git-send-email-vaibhav.bedia@gmail.com> X-Mailer: git-send-email 1.8.1.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140216_181621_818868_07963B49 X-CRM114-Status: UNSURE ( 9.86 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.7 (--) Cc: linux-omap@vger.kernel.org, Vaibhav Bedia , linux-arm-kernel@lists.infradead.org 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.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Use the correct register offset for issuing the reset command in OMAP5. Since dev_inst is set dynamically OMAP4 should not be affected by this change. Signed-off-by: Vaibhav Bedia Tested-by: Lokesh Vutla Acked-by: Rajendra Nayak --- Applies on top of v3.14-rc3 arch/arm/mach-omap2/prminst44xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/prminst44xx.c b/arch/arm/mach-omap2/prminst44xx.c index 6334b96..280f3c5 100644 --- a/arch/arm/mach-omap2/prminst44xx.c +++ b/arch/arm/mach-omap2/prminst44xx.c @@ -183,11 +183,11 @@ void omap4_prminst_global_warm_sw_reset(void) OMAP4_PRM_RSTCTRL_OFFSET); v |= OMAP4430_RST_GLOBAL_WARM_SW_MASK; omap4_prminst_write_inst_reg(v, OMAP4430_PRM_PARTITION, - OMAP4430_PRM_DEVICE_INST, + dev_inst, OMAP4_PRM_RSTCTRL_OFFSET); /* OCP barrier */ v = omap4_prminst_read_inst_reg(OMAP4430_PRM_PARTITION, - OMAP4430_PRM_DEVICE_INST, + dev_inst, OMAP4_PRM_RSTCTRL_OFFSET); }