From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Cousson, Benoit" Subject: Re: [PATCH] ARM: omap4: prm: Fix up swapped offset macros Date: Mon, 7 Nov 2011 14:24:05 +0100 Message-ID: <4EB7DBF5.8000305@ti.com> References: <1320660386-18148-1-git-send-email-rnayak@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Return-path: Received: from comal.ext.ti.com ([198.47.26.152]:52286 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754377Ab1KGNYI (ORCPT ); Mon, 7 Nov 2011 08:24:08 -0500 Received: from dlep34.itg.ti.com ([157.170.170.115]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id pA7DO7sG008432 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 7 Nov 2011 07:24:07 -0600 Received: from dlep26.itg.ti.com (smtp-le.itg.ti.com [157.170.170.27]) by dlep34.itg.ti.com (8.13.7/8.13.8) with ESMTP id pA7DO7eo017276 for ; Mon, 7 Nov 2011 07:24:07 -0600 (CST) Received: from DFLE71.ent.ti.com (localhost [127.0.0.1]) by dlep26.itg.ti.com (8.13.8/8.13.8) with ESMTP id pA7DO74X003745 for ; Mon, 7 Nov 2011 07:24:07 -0600 (CST) In-Reply-To: <1320660386-18148-1-git-send-email-rnayak@ti.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Rajendra Nayak Cc: linux-omap@vger.kernel.org, Gina Glaser Hi Rajendra, On 11/7/2011 11:06 AM, Rajendra Nayak wrote: > The offset macros for OMAP4_RM_RSTST and OMAP4_RM_RSTTIME > are wrongly swapped up. > > Thanks to Gina Glaser for identifying and reporting this. > > Signed-off-by: Rajendra Nayak > Cc: Gina Glaser > --- > arch/arm/mach-omap2/prm44xx.h | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-omap2/prm44xx.h b/arch/arm/mach-omap2/prm44xx.h > index 3d66ccd..aa8593e 100644 > --- a/arch/arm/mach-omap2/prm44xx.h > +++ b/arch/arm/mach-omap2/prm44xx.h > @@ -62,8 +62,8 @@ > > /* OMAP4 specific register offsets */ > #define OMAP4_RM_RSTCTRL 0x0000 > -#define OMAP4_RM_RSTTIME 0x0004 > -#define OMAP4_RM_RSTST 0x0008 > +#define OMAP4_RM_RSTST 0x0004 > +#define OMAP4_RM_RSTTIME 0x0008 > #define OMAP4_PM_PWSTCTRL 0x0000 > #define OMAP4_PM_PWSTST 0x0004 In fact these defines were already defined correctly later (with a slightly different name): /* PRM.DEVICE_PRM register offsets */ [...] #define OMAP4_PRM_RSTST_OFFSET 0x0004 #define OMAP4430_PRM_RSTST OMAP44XX_PRM_REGADDR(OMAP4430_PRM_DEVICE_INST, 0x0004) #define OMAP4_PRM_RSTTIME_OFFSET 0x0008 #define OMAP4430_PRM_RSTTIME OMAP44XX_PRM_REGADDR(OMAP4430_PRM_DEVICE_INST, 0x0008) I don't know where these defines are used, but we'd better use the existing ones. Benoit