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

Commit 44421e42 authored by Sascha Hauer's avatar Sascha Hauer
Browse files

[ARM] MXC: do not include mach/hardware.h from mach/timex.h 



Instead of including other header files, define CLOCK_TICK_RATE directly

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 9d631b83

arch/arm/plat-mxc/include/mach/mx1.h

+0 −5
Original line number Diff line number Diff line
@@ -18,11 +18,6 @@ 


#include <mach/vmalloc.h>



/*

 * defines the hardware clock tick rate

 */

#define CLOCK_TICK_RATE	16000000



#define PHYS_OFFSET	UL(0x08000000)



/*

arch/arm/plat-mxc/include/mach/mx27.h

+0 −3
Original line number Diff line number Diff line
@@ -289,9 +289,6 @@ extern int mx27_revision(void); 
/* this CPU supports up to 192 GPIOs (don't forget the baseboard!) */

#define ARCH_NR_GPIOS		(192 + 16)



/* OS clock tick rate */

#define CLOCK_TICK_RATE         13300000



/* Start of RAM */

#define PHYS_OFFSET		SDRAM_BASE_ADDR

arch/arm/plat-mxc/include/mach/mx31.h

+0 −5
Original line number Diff line number Diff line
@@ -15,11 +15,6 @@ 
#error "Do not include directly."

#endif



/*!

 * defines the hardware clock tick rate

 */

#define CLOCK_TICK_RATE		16625000



/*

 * MX31 memory map:

 *

arch/arm/plat-mxc/include/mach/timex.h

+7 −1
Original line number Diff line number Diff line
@@ -20,6 +20,12 @@ 
#ifndef __ASM_ARCH_MXC_TIMEX_H__

#define __ASM_ARCH_MXC_TIMEX_H__



#include <mach/hardware.h>	/* for CLOCK_TICK_RATE */

#if defined CONFIG_ARCH_MX1

#define CLOCK_TICK_RATE		16000000

#elif defined CONFIG_ARCH_MX2

#define CLOCK_TICK_RATE		13300000

#elif defined CONFIG_ARCH_MX3

#define CLOCK_TICK_RATE		16625000

#endif



#endif				/* __ASM_ARCH_MXC_TIMEX_H__ */