Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79f08d9e authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

ARM: drop <mach/timex.h> for !ARCH_MULTIPLATFORM, too 



While <mach/timex.h> isn't used for multi-platform builds since long it
still is for "normal" builds. As the previous patches fix all sites to
not make use of this per-platform file, it can go now for good also for
platforms that are not (yet) converted to multi-platform.

While at it there are no users of CLOCK_TICK_RATE any more, so also drop
the dummy #define.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 53985371

arch/arm/include/asm/timex.h

+0 −6
Original line number Diff line number Diff line
@@ -12,12 +12,6 @@ 
#ifndef _ASMARM_TIMEX_H

#define _ASMARM_TIMEX_H



#ifdef CONFIG_ARCH_MULTIPLATFORM

#define CLOCK_TICK_RATE 1000000

#else

#include <mach/timex.h>

#endif



typedef unsigned long cycles_t;

#define get_cycles()	({ cycles_t c; read_current_timer(&c) ? 0 : c; })

arch/arm/mach-at91/include/mach/timex.h

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-at91/include/mach/timex.h

 *

 *  Copyright (C) 2003 SAN People

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */



#ifndef __ASM_ARCH_TIMEX_H

#define __ASM_ARCH_TIMEX_H



#include <mach/hardware.h>



#ifdef CONFIG_ARCH_AT91X40



#define AT91X40_MASTER_CLOCK	40000000

#define CLOCK_TICK_RATE		(AT91X40_MASTER_CLOCK)



#else



#define CLOCK_TICK_RATE		12345678



#endif



#endif /* __ASM_ARCH_TIMEX_H */

arch/arm/mach-clps711x/include/mach/timex.h

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
/* Bogus value */

#define CLOCK_TICK_RATE 512000

arch/arm/mach-davinci/include/mach/timex.h

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
/*

 * DaVinci timer defines

 *

 * Author: Kevin Hilman, MontaVista Software, Inc. <source@mvista.com>

 *

 * 2007 (c) MontaVista Software, Inc. This file is licensed under

 * the terms of the GNU General Public License version 2. This program

 * is licensed "as is" without any warranty of any kind, whether express

 * or implied.

 */

#ifndef __ASM_ARCH_TIMEX_H

#define __ASM_ARCH_TIMEX_H



/*

 * Alert: Not all timers of the DaVinci family run at a frequency of 27MHz,

 * but we should be fine as long as CLOCK_TICK_RATE or LATCH (see include/

 * linux/jiffies.h) are not used directly in code. Currently none of the

 * code relevant to DaVinci platform depends on these values directly.

 */

#define CLOCK_TICK_RATE 27000000



#endif /* __ASM_ARCH_TIMEX_H__ */

arch/arm/mach-dove/include/mach/timex.h

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-dove/include/mach/timex.h

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2.  This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



#define CLOCK_TICK_RATE		(100 * HZ)