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: 3659031 Return-Path: X-Original-To: patchwork-linux-omap@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 2F654BF13A for ; Sun, 16 Feb 2014 23:16:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4E05E201EF for ; Sun, 16 Feb 2014 23:16:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 63462201E4 for ; Sun, 16 Feb 2014 23:16:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751956AbaBPXPx (ORCPT ); Sun, 16 Feb 2014 18:15:53 -0500 Received: from mail-yh0-f44.google.com ([209.85.213.44]:63438 "EHLO mail-yh0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751197AbaBPXPx (ORCPT ); Sun, 16 Feb 2014 18:15:53 -0500 Received: by mail-yh0-f44.google.com with SMTP id f73so13688614yha.31 for ; Sun, 16 Feb 2014 15:15:52 -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 Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Vaibhav Bedia 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 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 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); }