From patchwork Thu Aug 4 18:14:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartley Sweeten X-Patchwork-Id: 1036662 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p74IFkRl032544 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 4 Aug 2011 18:16:07 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qp2S9-0003QF-I2; Thu, 04 Aug 2011 18:15:29 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qp2S9-0003lX-2M; Thu, 04 Aug 2011 18:15:29 +0000 Received: from mail160.messagelabs.com ([216.82.253.99]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qp2S5-0003l7-SB for linux-arm-kernel@lists.infradead.org; Thu, 04 Aug 2011 18:15:26 +0000 X-VirusChecked: Checked X-Env-Sender: hartleys@visionengravers.com X-Msg-Ref: server-7.tower-160.messagelabs.com!1312481722!30662068!2 X-StarScan-Version: 6.2.17; banners=-,-,- X-Originating-IP: [216.166.12.99] Received: (qmail 31748 invoked from network); 4 Aug 2011 18:15:22 -0000 Received: from out001.collaborationhost.net (HELO out001.collaborationhost.net) (216.166.12.99) by server-7.tower-160.messagelabs.com with RC4-SHA encrypted SMTP; 4 Aug 2011 18:15:22 -0000 Received: from AUSP01VMBX24.collaborationhost.net ([10.2.12.1]) by AUSP01MHUB08.collaborationhost.net ([10.2.8.243]) with mapi; Thu, 4 Aug 2011 13:14:37 -0500 From: H Hartley Sweeten To: H Hartley Sweeten , "dsaxena@plexity.net" , "linux-arm-kernel@lists.infradead.org" , Lennert Buytenhek Date: Thu, 4 Aug 2011 13:14:35 -0500 Subject: RE: [PATCH 12/12] ARM: Remove mach-*/include/mach/timex.h Thread-Topic: [PATCH 12/12] ARM: Remove mach-*/include/mach/timex.h Thread-Index: AcxSrh53uNYOyEEpTgKSlr8jnNx4jgAH95kgAACT9rA= Message-ID: References: <20110804135445.GJ1019@plexity.net> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110804_141526_117805_43872916 X-CRM114-Status: GOOD ( 15.84 ) X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [216.82.253.99 listed in list.dnswl.org] Cc: Nicolas Pitre , "rmk@arm.linux.org.uk" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 04 Aug 2011 18:18:25 +0000 (UTC) On Thursday, August 04, 2011 10:53 AM, H Hartley Sweeten wrote: > On Thursday, August 04, 2011 6:55 AM, Deepak Saxena wrote: >> >> We no longer use the global LATCH definition to drive >> any platform-specific timers so we can remove the >> timex.h files from all sub-arch include directories. >> >> We still need to keep an ARM CLOCK_TICK_RATE due to >> jiffies.h depending on it to build but that will be >> removed in the future once all non-ARM references to >> LATCH are also removed. >> >> Signed-off-by: Deepak Saxena >> --- > > [snip] > >> diff --git a/arch/arm/include/asm/timex.h b/arch/arm/include/asm/timex.h >> index 3be8de3..c4f4dac 100644 >> --- a/arch/arm/include/asm/timex.h >> +++ b/arch/arm/include/asm/timex.h >> @@ -12,7 +12,10 @@ >> #ifndef _ASMARM_TIMEX_H >> #define _ASMARM_TIMEX_H >> >> -#include >> +/* >> + * Bogus value used to allow kernel to build >> + */ >> +#define CLOCK_TICK_RATE 1000000 >> >> typedef unsigned long cycles_t; >> > > [snip] > >> diff --git a/arch/arm/mach-ep93xx/include/mach/timex.h b/arch/arm/mach-ep93xx/include/mach/timex.h >> deleted file mode 100644 >> index 6b3503b..0000000 >> --- a/arch/arm/mach-ep93xx/include/mach/timex.h >> +++ /dev/null >> @@ -1,5 +0,0 @@ >> -/* >> - * arch/arm/mach-ep93xx/include/mach/timex.h >> - */ >> - >> -#define CLOCK_TICK_RATE 983040 > > Confused... > > mach-ep93xx/core.c uses the CLOCK_TICK_RATE to determine TIMER4_TICKS_PER_JIFFY. > Timer 4 runs at 983.04 kHz, this patch changes this rate to 1 MHz. Won't that > effect the sys_timer? BTW, it looks like Lennert's patch correctly handled this. http://lists.infradead.org/pipermail/linux-arm-kernel/2010-October/029452.html Here's the relevant piece. Regards, Hartley diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index 4cb55d3..3d6d015 100644 --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c @@ -111,7 +111,8 @@ void __init ep93xx_map_io(void) #define EP93XX_TIMER4_CLOCK 983040 #define TIMER1_RELOAD ((EP93XX_TIMER123_CLOCK / HZ) - 1) -#define TIMER4_TICKS_PER_JIFFY DIV_ROUND_CLOSEST(CLOCK_TICK_RATE, HZ) +#define TIMER4_TICKS_PER_JIFFY \ + DIV_ROUND_CLOSEST(EP93XX_TIMER4_CLOCK, HZ) static unsigned int last_jiffy_time;