From patchwork Mon Aug 5 10:02:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ujhelyi.m@gmail.com X-Patchwork-Id: 2838625 Return-Path: X-Original-To: patchwork-linux-omap@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 A08B79F479 for ; Mon, 5 Aug 2013 10:02:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7BC542020E for ; Mon, 5 Aug 2013 10:02:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5DEB620204 for ; Mon, 5 Aug 2013 10:02:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754107Ab3HEKCr (ORCPT ); Mon, 5 Aug 2013 06:02:47 -0400 Received: from mail-bk0-f51.google.com ([209.85.214.51]:38545 "EHLO mail-bk0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754068Ab3HEKCq (ORCPT ); Mon, 5 Aug 2013 06:02:46 -0400 Received: by mail-bk0-f51.google.com with SMTP id ji2so883228bkc.38 for ; Mon, 05 Aug 2013 03:02:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=bkjWmA3KXEuUcjr1Nk+Y9tlbvjnKyhPca7XPqx5WZb0=; b=E9Kd6T3CI8zU3fvdWlhPYWJGAm/Sbn4Hsqtd8coJP+liG6F3Zknp9IFX/LDPjHwoWe 92O2dLv2X8cHps2cpRAmxCPK9u+UUZ3r9SZ0U7GQSOJM1MhOIHADiQrWM2XyA7SSQRaq EUN/jGgFwB9H9XLOGPlTk1hE6K0nqtxH86+ciAmtcZJGL+M4cfGK4v4SjW06Aq36xPvr DLJjtmVENMwyaSLoB4/2eP3QdWI/BmKLs+syctTnsM8ao7Djm9XNM5CFM/CHBxr642kw RXlzOFSBMaFoFIEcI0B/ubvFCF4qwhcmiOhLSbd92ST8Zrst1S5Wf93oJ78eiOflDs/V 6oBg== X-Received: by 10.205.37.70 with SMTP id td6mr1921749bkb.13.1375696965353; Mon, 05 Aug 2013 03:02:45 -0700 (PDT) Received: from matus-desktop.sueba (81.89.61.168.vnet.sk. [81.89.61.168]) by mx.google.com with ESMTPSA id h5sm2371366bkg.8.2013.08.05.03.02.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 05 Aug 2013 03:02:44 -0700 (PDT) From: ujhelyi.m@gmail.com To: tony@atomide.com, linux@arm.linux.org.uk Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, ujhelyi.m@gmail.com Subject: [PATCH] am33xx-restart: trigger warm reset on omap2+ boards Date: Mon, 5 Aug 2013 12:02:24 +0200 Message-Id: <1375696944-13380-1-git-send-email-ujhelyi.m@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.8 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 From: Matus Ujhelyi Currently the cold reset was triggered. It happened due to oposite offsets of cold/warm flags in PRM_RSTST and PRM_RSTCTRL registers. Signed-off-by: Matus Ujhelyi --- arch/arm/mach-omap2/am33xx-restart.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/am33xx-restart.c b/arch/arm/mach-omap2/am33xx-restart.c index 1eae962..c88d8df7 100644 --- a/arch/arm/mach-omap2/am33xx-restart.c +++ b/arch/arm/mach-omap2/am33xx-restart.c @@ -24,8 +24,8 @@ void am33xx_restart(enum reboot_mode mode, const char *cmd) { /* TODO: Handle mode and cmd if necessary */ - am33xx_prm_rmw_reg_bits(AM33XX_GLOBAL_WARM_SW_RST_MASK, - AM33XX_GLOBAL_WARM_SW_RST_MASK, + am33xx_prm_rmw_reg_bits(AM33XX_RST_GLOBAL_WARM_SW_MASK, + AM33XX_RST_GLOBAL_WARM_SW_MASK, AM33XX_PRM_DEVICE_MOD, AM33XX_PRM_RSTCTRL_OFFSET);