openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: at91: don't use <mach/timex.h> 

The platform specific <mach/timex.h> will be removed in a later patch.
So move its only still used symbol to a different header specific for
the only machine still using it. Also add a few explicit includes of
<mach/hardware.h> that are implicitly available through <mach/timex.h>.

Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
This commit is contained in:
Uwe Kleine-König 2013-11-14 10:49:19 +01:00
parent a509ad0ca7
commit ac11a1d46c
21 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-at91/at91rm9200.c
View File

@ -21,6 +21,7 @@
#include <mach/at91_pmc.h>
#include <mach/at91_st.h>
#include <mach/cpu.h>
#include <mach/hardware.h>
#include "at91_aic.h"
#include "soc.h"

1
arch/arm/mach-at91/at91rm9200_devices.c
View File

@ -21,6 +21,7 @@
#include <mach/at91rm9200.h>
#include <mach/at91rm9200_mc.h>
#include <mach/at91_ramc.h>
#include <mach/hardware.h>
#include "board.h"
#include "generic.h"

1
arch/arm/mach-at91/at91rm9200_time.c
View File

@ -31,6 +31,7 @@
#include <asm/mach/time.h>
#include <mach/at91_st.h>
#include <mach/hardware.h>
static unsigned long last_crtr;
static u32 irqmask;

1
arch/arm/mach-at91/at91sam9260.c
View File

@ -21,6 +21,7 @@
#include <mach/at91_dbgu.h>
#include <mach/at91sam9260.h>
#include <mach/at91_pmc.h>
#include <mach/hardware.h>
#include "at91_aic.h"
#include "at91_rstc.h"

1
arch/arm/mach-at91/at91sam9260_devices.c
View File

@ -25,6 +25,7 @@
#include <mach/at91_matrix.h>
#include <mach/at91sam9_smc.h>
#include <mach/at91_adc.h>
#include <mach/hardware.h>
#include "board.h"
#include "generic.h"

1
arch/arm/mach-at91/at91sam9261.c
View File

@ -20,6 +20,7 @@
#include <mach/cpu.h>
#include <mach/at91sam9261.h>
#include <mach/at91_pmc.h>
#include <mach/hardware.h>
#include "at91_aic.h"
#include "at91_rstc.h"

1
arch/arm/mach-at91/at91sam9261_devices.c
View File

@ -25,6 +25,7 @@
#include <mach/at91sam9261_matrix.h>
#include <mach/at91_matrix.h>
#include <mach/at91sam9_smc.h>
#include <mach/hardware.h>
#include "board.h"
#include "generic.h"

1
arch/arm/mach-at91/at91sam9263.c
View File

@ -19,6 +19,7 @@
#include <asm/system_misc.h>
#include <mach/at91sam9263.h>
#include <mach/at91_pmc.h>
#include <mach/hardware.h>
#include "at91_aic.h"
#include "at91_rstc.h"

1
arch/arm/mach-at91/at91sam9263_devices.c
View File

@ -24,6 +24,7 @@
#include <mach/at91sam9263_matrix.h>
#include <mach/at91_matrix.h>
#include <mach/at91sam9_smc.h>
#include <mach/hardware.h>
#include "board.h"
#include "generic.h"

1
arch/arm/mach-at91/at91sam926x_time.c
View File

@ -19,6 +19,7 @@
#include <linux/of_irq.h>
#include <asm/mach/time.h>
#include <mach/hardware.h>
#define AT91_PIT_MR 0x00 /* Mode Register */
#define AT91_PIT_PITIEN (1 << 25) /* Timer Interrupt Enable */

1
arch/arm/mach-at91/at91sam9g45.c
View File

@ -20,6 +20,7 @@
#include <mach/at91sam9g45.h>
#include <mach/at91_pmc.h>
#include <mach/cpu.h>
#include <mach/hardware.h>
#include "at91_aic.h"
#include "soc.h"

1
arch/arm/mach-at91/at91sam9g45_devices.c
View File

@ -32,6 +32,7 @@
#include <mach/at91sam9_smc.h>
#include <linux/platform_data/dma-atmel.h>
#include <mach/atmel-mci.h>
#include <mach/hardware.h>
#include <media/atmel-isi.h>

1
arch/arm/mach-at91/at91sam9rl.c
View File

@ -20,6 +20,7 @@
#include <mach/at91_dbgu.h>
#include <mach/at91sam9rl.h>
#include <mach/at91_pmc.h>
#include <mach/hardware.h>
#include "at91_aic.h"
#include "at91_rstc.h"

1
arch/arm/mach-at91/at91sam9rl_devices.c
View File

@ -21,6 +21,7 @@
#include <mach/at91sam9rl_matrix.h>
#include <mach/at91_matrix.h>
#include <mach/at91sam9_smc.h>
#include <mach/hardware.h>
#include <linux/platform_data/dma-atmel.h>
#include "board.h"

2
arch/arm/mach-at91/at91x40.c
View File

@ -19,7 +19,7 @@
#include <asm/mach/arch.h>
#include <mach/at91x40.h>
#include <mach/at91_st.h>
#include <mach/timex.h>
#include <mach/hardware.h>
#include "at91_aic.h"
#include "generic.h"

1
arch/arm/mach-at91/at91x40_time.c
View File

@ -25,6 +25,7 @@
#include <linux/time.h>
#include <linux/io.h>
#include <mach/hardware.h>
#include <mach/at91x40.h>
#include <asm/mach/time.h>
#include "at91_tc.h"

1
arch/arm/mach-at91/board-gsia18s.c
View File

@ -31,6 +31,7 @@
#include <asm/mach/arch.h>
#include <mach/at91sam9_smc.h>
#include <mach/hardware.h>
#include "at91_aic.h"
#include "board.h"

1
arch/arm/mach-at91/board-pcontrol-g20.c
View File

@ -30,6 +30,7 @@
#include <asm/mach/arch.h>
#include <mach/at91sam9_smc.h>
#include <mach/hardware.h>
#include "at91_aic.h"
#include "board.h"

1
arch/arm/mach-at91/board-stamp9g20.c
View File

@ -26,6 +26,7 @@
#include <asm/mach/arch.h>
#include <mach/at91sam9_smc.h>
#include <mach/hardware.h>
#include "at91_aic.h"
#include "board.h"

2
arch/arm/mach-at91/include/mach/at91x40.h
View File

@ -55,4 +55,6 @@
#define AT91_PS_CR (AT91_PS + 0) /* PS Control register */
#define AT91_PS_CR_CPU (1 << 0) /* CPU clock disable bit */
#define AT91X40_MASTER_CLOCK 40000000
#endif /* AT91X40_H */

1
arch/arm/mach-at91/pm.c
View File

@ -27,6 +27,7 @@
#include <mach/at91_pmc.h>
#include <mach/cpu.h>
#include <mach/hardware.h>
#include "at91_aic.h"
#include "generic.h"