From ab277121426edca2ee0601fc6318c9467350771e Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Tue, 29 Jul 2008 14:08:14 +0800 Subject: [PATCH 01/16] [ARM] pxa: introduce reset.h for reset specific header information Signed-off-by: Eric Miao --- arch/arm/mach-pxa/reset.c | 1 + arch/arm/mach-pxa/spitz.c | 1 + arch/arm/mach-pxa/tosa.c | 1 + include/asm-arm/arch-pxa/hardware.h | 5 ----- include/asm-arm/arch-pxa/reset.h | 9 +++++++++ 5 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 include/asm-arm/arch-pxa/reset.h diff --git a/arch/arm/mach-pxa/reset.c b/arch/arm/mach-pxa/reset.c index 9d39dea57ce2..d610a1244abb 100644 --- a/arch/arm/mach-pxa/reset.c +++ b/arch/arm/mach-pxa/reset.c @@ -12,6 +12,7 @@ #include #include +#include static void do_hw_reset(void); diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 762249c03ded..207fe3e6a3d2 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index fea17ce6b55f..4bd7d4f006e2 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include diff --git a/include/asm-arm/arch-pxa/hardware.h b/include/asm-arm/arch-pxa/hardware.h index 979a45695d7d..351d0a721769 100644 --- a/include/asm-arm/arch-pxa/hardware.h +++ b/include/asm-arm/arch-pxa/hardware.h @@ -224,11 +224,6 @@ extern void pxa_gpio_set_value(unsigned gpio, int value); */ extern unsigned int get_memclk_frequency_10khz(void); -/* - * register GPIO as reset generator - */ -extern int init_gpio_reset(int gpio); - #endif #if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI) diff --git a/include/asm-arm/arch-pxa/reset.h b/include/asm-arm/arch-pxa/reset.h new file mode 100644 index 000000000000..6ca72c5cf7db --- /dev/null +++ b/include/asm-arm/arch-pxa/reset.h @@ -0,0 +1,9 @@ +#ifndef __ASM_ARCH_RESET_H +#define __ASM_ARCH_RESET_H + +/* + * register GPIO as reset generator + */ +extern int init_gpio_reset(int gpio); + +#endif /* __ASM_ARCH_RESET_H */ -- GitLab From 04fef228fb00dd79475a2313f4ba73b4fbfe2faa Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Tue, 29 Jul 2008 14:26:00 +0800 Subject: [PATCH 02/16] [ARM] pxa: introduce reset_status and clear_reset_status for driver's usage Due to the problem of reset status bits being handled by different registers between pxa2xx and pxa3xx, introduce a global reset_status variable, initialized by SoC-specific code and later being used by other drivers. And also introduce clear_reset_status(), which is used to clear the corresponding status bits. Pass RESET_STATUS_ALL to clear all bits. Signed-off-by: Eric Miao --- arch/arm/mach-pxa/generic.c | 10 ++++++++++ arch/arm/mach-pxa/generic.h | 8 ++++++++ arch/arm/mach-pxa/pxa25x.c | 4 ++++ arch/arm/mach-pxa/pxa27x.c | 4 ++++ arch/arm/mach-pxa/pxa2xx.c | 9 +++++++++ arch/arm/mach-pxa/pxa3xx.c | 10 ++++++++++ arch/arm/mach-pxa/reset.c | 7 ++++--- arch/arm/mach-sa1100/generic.c | 3 +++ include/asm-arm/arch-pxa/reset.h | 9 +++++++++ include/asm-arm/arch-sa1100/reset.h | 18 ++++++++++++++++++ 10 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 include/asm-arm/arch-sa1100/reset.h diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index ca053226fba0..36638926c5ce 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c @@ -26,9 +26,19 @@ #include #include +#include #include "generic.h" +void clear_reset_status(unsigned int mask) +{ + if (cpu_is_pxa2xx()) + pxa2xx_clear_reset_status(mask); + + if (cpu_is_pxa3xx()) + pxa3xx_clear_reset_status(mask); +} + /* * Get the clock frequency as reflected by CCCR and the turbo flag. * We assume these values have been applied via a fcs. diff --git a/arch/arm/mach-pxa/generic.h b/arch/arm/mach-pxa/generic.h index 5bb7ae757831..041c048320e4 100644 --- a/arch/arm/mach-pxa/generic.h +++ b/arch/arm/mach-pxa/generic.h @@ -47,12 +47,20 @@ extern unsigned pxa27x_get_memclk_frequency_10khz(void); #define pxa27x_get_memclk_frequency_10khz() (0) #endif +#if defined(CONFIG_PXA25x) || defined(CONFIG_PXA27x) +extern void pxa2xx_clear_reset_status(unsigned int); +#else +static inline void pxa2xx_clear_reset_status(unsigned int mask) {} +#endif + #ifdef CONFIG_PXA3xx extern unsigned pxa3xx_get_clk_frequency_khz(int); extern unsigned pxa3xx_get_memclk_frequency_10khz(void); +extern void pxa3xx_clear_reset_status(unsigned int); #else #define pxa3xx_get_clk_frequency_khz(x) (0) #define pxa3xx_get_memclk_frequency_10khz() (0) +static inline void pxa3xx_clear_reset_status(unsigned int mask) {} #endif extern struct sysdev_class pxa_irq_sysclass; diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index c5b845b935bb..49a7a296ff31 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -348,6 +349,9 @@ static int __init pxa25x_init(void) clks_register(&pxa25x_hwuart_clk, 1); if (cpu_is_pxa21x() || cpu_is_pxa25x()) { + + reset_status = RCSR; + clks_register(pxa25x_clks, ARRAY_SIZE(pxa25x_clks)); if ((ret = pxa_init_dma(16))) diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index d5d14ea33f27..a8c12347a5a9 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -384,6 +385,9 @@ static int __init pxa27x_init(void) int i, ret = 0; if (cpu_is_pxa27x()) { + + reset_status = RCSR; + clks_register(pxa27x_clks, ARRAY_SIZE(pxa27x_clks)); if ((ret = pxa_init_dma(32))) diff --git a/arch/arm/mach-pxa/pxa2xx.c b/arch/arm/mach-pxa/pxa2xx.c index d4f6415e8413..d93d3e6a6e27 100644 --- a/arch/arm/mach-pxa/pxa2xx.c +++ b/arch/arm/mach-pxa/pxa2xx.c @@ -14,10 +14,19 @@ #include #include +#include +#include #include #include +#include #include +void pxa2xx_clear_reset_status(unsigned int mask) +{ + /* RESET_STATUS_* has a 1:1 mapping with RCSR */ + RCSR = mask; +} + static unsigned long pxa2xx_mfp_fir[] = { GPIO46_FICP_RXD, GPIO47_FICP_TXD, diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index f491025a0c82..3d36c790f5ce 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c @@ -24,6 +24,7 @@ #include #include +#include #include #include #include @@ -109,6 +110,12 @@ unsigned int pxa3xx_get_memclk_frequency_10khz(void) return (clk / 10000); } +void pxa3xx_clear_reset_status(unsigned int mask) +{ + /* RESET_STATUS_* has a 1:1 mapping with ARSR */ + ARSR = mask; +} + /* * Return the current AC97 clock frequency. */ @@ -532,6 +539,9 @@ static int __init pxa3xx_init(void) int i, ret = 0; if (cpu_is_pxa3xx()) { + + reset_status = ARSR; + /* * clear RDH bit every time after reset * diff --git a/arch/arm/mach-pxa/reset.c b/arch/arm/mach-pxa/reset.c index d610a1244abb..56f60d923a9d 100644 --- a/arch/arm/mach-pxa/reset.c +++ b/arch/arm/mach-pxa/reset.c @@ -11,9 +11,11 @@ #include #include -#include #include +unsigned int reset_status; +EXPORT_SYMBOL(reset_status); + static void do_hw_reset(void); static int reset_gpio = -1; @@ -78,8 +80,7 @@ static void do_hw_reset(void) void arch_reset(char mode) { - if (cpu_is_pxa2xx()) - RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR; + clear_reset_status(RESET_STATUS_ALL); switch (mode) { case 's': diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c index 0c2fa1c4fb4c..3b6fc090c8ef 100644 --- a/arch/arm/mach-sa1100/generic.c +++ b/arch/arm/mach-sa1100/generic.c @@ -31,6 +31,9 @@ #include "generic.h" +unsigned int reset_status; +EXPORT_SYMBOL(reset_status); + #define NR_FREQS 16 /* diff --git a/include/asm-arm/arch-pxa/reset.h b/include/asm-arm/arch-pxa/reset.h index 6ca72c5cf7db..9489a48871a8 100644 --- a/include/asm-arm/arch-pxa/reset.h +++ b/include/asm-arm/arch-pxa/reset.h @@ -1,6 +1,15 @@ #ifndef __ASM_ARCH_RESET_H #define __ASM_ARCH_RESET_H +#define RESET_STATUS_HARDWARE (1 << 0) /* Hardware Reset */ +#define RESET_STATUS_WATCHDOG (1 << 1) /* Watchdog Reset */ +#define RESET_STATUS_LOWPOWER (1 << 2) /* Low Power/Sleep Exit */ +#define RESET_STATUS_GPIO (1 << 3) /* GPIO Reset */ +#define RESET_STATUS_ALL (0xf) + +extern unsigned int reset_status; +extern void clear_reset_status(unsigned int mask); + /* * register GPIO as reset generator */ diff --git a/include/asm-arm/arch-sa1100/reset.h b/include/asm-arm/arch-sa1100/reset.h new file mode 100644 index 000000000000..f61957e6842a --- /dev/null +++ b/include/asm-arm/arch-sa1100/reset.h @@ -0,0 +1,18 @@ +#ifndef __ASM_ARCH_RESET_H +#define __ASM_ARCH_RESET_H + +#include "hardware.h" + +#define RESET_STATUS_HARDWARE (1 << 0) /* Hardware Reset */ +#define RESET_STATUS_WATCHDOG (1 << 1) /* Watchdog Reset */ +#define RESET_STATUS_LOWPOWER (1 << 2) /* Exit from Low Power/Sleep */ +#define RESET_STATUS_GPIO (1 << 3) /* GPIO Reset */ +#define RESET_STATUS_ALL (0xf) + +extern unsigned int reset_status; +static inline void clear_reset_status(unsigned int mask) +{ + RCSR = mask; +} + +#endif /* __ASM_ARCH_RESET_H */ -- GitLab From 214c6a7ed13e01cab2addeef56124067e4d20147 Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Tue, 29 Jul 2008 14:39:34 +0800 Subject: [PATCH 03/16] [ARM] sa1100_wdt: use reset_status to remember watchdog reset status Signed-off-by: Eric Miao --- drivers/watchdog/sa1100_wdt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c index 34a2b3b81800..e42002d2f815 100644 --- a/drivers/watchdog/sa1100_wdt.c +++ b/drivers/watchdog/sa1100_wdt.c @@ -31,6 +31,8 @@ #include #endif +#include + #include #include @@ -162,7 +164,8 @@ static int __init sa1100dog_init(void) * we suspend, RCSR will be cleared, and the watchdog * reset reason will be lost. */ - boot_status = (RCSR & RCSR_WDR) ? WDIOF_CARDRESET : 0; + boot_status = (reset_status & RESET_STATUS_WATCHDOG) ? + WDIOF_CARDRESET : 0; pre_margin = OSCR_FREQ * margin; ret = misc_register(&sa1100dog_miscdev); -- GitLab From 84db8d7cdb072866f5a6c6ac2c9a74c5c48dd22f Mon Sep 17 00:00:00 2001 From: Haavard Skinnemoen Date: Tue, 5 Aug 2008 13:35:07 +0200 Subject: [PATCH 04/16] avr32: Move include/asm-avr32 to arch/avr32/include/asm Leaving include/asm/arch alone for now. Signed-off-by: Haavard Skinnemoen --- {include/asm-avr32 => arch/avr32/include/asm}/Kbuild | 0 {include/asm-avr32 => arch/avr32/include/asm}/a.out.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/addrspace.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/asm.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/atmel-mci.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/atomic.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/auxvec.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/bitops.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/bug.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/bugs.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/byteorder.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/cache.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/cachectl.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/cacheflush.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/checksum.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/cputime.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/current.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/delay.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/device.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/div64.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/dma-mapping.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/dma.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/elf.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/emergency-restart.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/errno.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/fb.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/fcntl.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/futex.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/gpio.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/hardirq.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/hw_irq.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/io.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/ioctl.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/ioctls.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/ipcbuf.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/irq.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/irq_regs.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/irqflags.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/kdebug.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/kmap_types.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/kprobes.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/linkage.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/local.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/mach/serial_at91.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/mman.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/mmu.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/mmu_context.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/module.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/msgbuf.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/mutex.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/numnodes.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/ocd.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/page.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/param.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/pci.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/percpu.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/pgalloc.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/pgtable-2level.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/pgtable.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/poll.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/posix_types.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/processor.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/ptrace.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/resource.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/scatterlist.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/sections.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/sembuf.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/serial.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/setup.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/shmbuf.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/shmparam.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/sigcontext.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/siginfo.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/signal.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/socket.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/sockios.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/stat.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/statfs.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/string.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/sysreg.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/system.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/termbits.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/termios.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/thread_info.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/timex.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/tlb.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/tlbflush.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/topology.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/traps.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/types.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/uaccess.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/ucontext.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/unaligned.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/unistd.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/user.h | 0 {include/asm-avr32 => arch/avr32/include/asm}/xor.h | 0 96 files changed, 0 insertions(+), 0 deletions(-) rename {include/asm-avr32 => arch/avr32/include/asm}/Kbuild (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/a.out.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/addrspace.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/asm.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/atmel-mci.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/atomic.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/auxvec.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/bitops.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/bug.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/bugs.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/byteorder.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/cache.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/cachectl.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/cacheflush.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/checksum.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/cputime.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/current.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/delay.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/device.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/div64.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/dma-mapping.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/dma.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/elf.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/emergency-restart.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/errno.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/fb.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/fcntl.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/futex.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/gpio.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/hardirq.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/hw_irq.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/io.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/ioctl.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/ioctls.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/ipcbuf.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/irq.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/irq_regs.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/irqflags.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/kdebug.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/kmap_types.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/kprobes.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/linkage.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/local.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/mach/serial_at91.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/mman.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/mmu.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/mmu_context.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/module.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/msgbuf.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/mutex.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/numnodes.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/ocd.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/page.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/param.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/pci.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/percpu.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/pgalloc.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/pgtable-2level.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/pgtable.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/poll.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/posix_types.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/processor.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/ptrace.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/resource.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/scatterlist.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/sections.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/sembuf.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/serial.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/setup.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/shmbuf.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/shmparam.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/sigcontext.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/siginfo.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/signal.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/socket.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/sockios.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/stat.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/statfs.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/string.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/sysreg.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/system.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/termbits.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/termios.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/thread_info.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/timex.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/tlb.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/tlbflush.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/topology.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/traps.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/types.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/uaccess.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/ucontext.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/unaligned.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/unistd.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/user.h (100%) rename {include/asm-avr32 => arch/avr32/include/asm}/xor.h (100%) diff --git a/include/asm-avr32/Kbuild b/arch/avr32/include/asm/Kbuild similarity index 100% rename from include/asm-avr32/Kbuild rename to arch/avr32/include/asm/Kbuild diff --git a/include/asm-avr32/a.out.h b/arch/avr32/include/asm/a.out.h similarity index 100% rename from include/asm-avr32/a.out.h rename to arch/avr32/include/asm/a.out.h diff --git a/include/asm-avr32/addrspace.h b/arch/avr32/include/asm/addrspace.h similarity index 100% rename from include/asm-avr32/addrspace.h rename to arch/avr32/include/asm/addrspace.h diff --git a/include/asm-avr32/asm.h b/arch/avr32/include/asm/asm.h similarity index 100% rename from include/asm-avr32/asm.h rename to arch/avr32/include/asm/asm.h diff --git a/include/asm-avr32/atmel-mci.h b/arch/avr32/include/asm/atmel-mci.h similarity index 100% rename from include/asm-avr32/atmel-mci.h rename to arch/avr32/include/asm/atmel-mci.h diff --git a/include/asm-avr32/atomic.h b/arch/avr32/include/asm/atomic.h similarity index 100% rename from include/asm-avr32/atomic.h rename to arch/avr32/include/asm/atomic.h diff --git a/include/asm-avr32/auxvec.h b/arch/avr32/include/asm/auxvec.h similarity index 100% rename from include/asm-avr32/auxvec.h rename to arch/avr32/include/asm/auxvec.h diff --git a/include/asm-avr32/bitops.h b/arch/avr32/include/asm/bitops.h similarity index 100% rename from include/asm-avr32/bitops.h rename to arch/avr32/include/asm/bitops.h diff --git a/include/asm-avr32/bug.h b/arch/avr32/include/asm/bug.h similarity index 100% rename from include/asm-avr32/bug.h rename to arch/avr32/include/asm/bug.h diff --git a/include/asm-avr32/bugs.h b/arch/avr32/include/asm/bugs.h similarity index 100% rename from include/asm-avr32/bugs.h rename to arch/avr32/include/asm/bugs.h diff --git a/include/asm-avr32/byteorder.h b/arch/avr32/include/asm/byteorder.h similarity index 100% rename from include/asm-avr32/byteorder.h rename to arch/avr32/include/asm/byteorder.h diff --git a/include/asm-avr32/cache.h b/arch/avr32/include/asm/cache.h similarity index 100% rename from include/asm-avr32/cache.h rename to arch/avr32/include/asm/cache.h diff --git a/include/asm-avr32/cachectl.h b/arch/avr32/include/asm/cachectl.h similarity index 100% rename from include/asm-avr32/cachectl.h rename to arch/avr32/include/asm/cachectl.h diff --git a/include/asm-avr32/cacheflush.h b/arch/avr32/include/asm/cacheflush.h similarity index 100% rename from include/asm-avr32/cacheflush.h rename to arch/avr32/include/asm/cacheflush.h diff --git a/include/asm-avr32/checksum.h b/arch/avr32/include/asm/checksum.h similarity index 100% rename from include/asm-avr32/checksum.h rename to arch/avr32/include/asm/checksum.h diff --git a/include/asm-avr32/cputime.h b/arch/avr32/include/asm/cputime.h similarity index 100% rename from include/asm-avr32/cputime.h rename to arch/avr32/include/asm/cputime.h diff --git a/include/asm-avr32/current.h b/arch/avr32/include/asm/current.h similarity index 100% rename from include/asm-avr32/current.h rename to arch/avr32/include/asm/current.h diff --git a/include/asm-avr32/delay.h b/arch/avr32/include/asm/delay.h similarity index 100% rename from include/asm-avr32/delay.h rename to arch/avr32/include/asm/delay.h diff --git a/include/asm-avr32/device.h b/arch/avr32/include/asm/device.h similarity index 100% rename from include/asm-avr32/device.h rename to arch/avr32/include/asm/device.h diff --git a/include/asm-avr32/div64.h b/arch/avr32/include/asm/div64.h similarity index 100% rename from include/asm-avr32/div64.h rename to arch/avr32/include/asm/div64.h diff --git a/include/asm-avr32/dma-mapping.h b/arch/avr32/include/asm/dma-mapping.h similarity index 100% rename from include/asm-avr32/dma-mapping.h rename to arch/avr32/include/asm/dma-mapping.h diff --git a/include/asm-avr32/dma.h b/arch/avr32/include/asm/dma.h similarity index 100% rename from include/asm-avr32/dma.h rename to arch/avr32/include/asm/dma.h diff --git a/include/asm-avr32/elf.h b/arch/avr32/include/asm/elf.h similarity index 100% rename from include/asm-avr32/elf.h rename to arch/avr32/include/asm/elf.h diff --git a/include/asm-avr32/emergency-restart.h b/arch/avr32/include/asm/emergency-restart.h similarity index 100% rename from include/asm-avr32/emergency-restart.h rename to arch/avr32/include/asm/emergency-restart.h diff --git a/include/asm-avr32/errno.h b/arch/avr32/include/asm/errno.h similarity index 100% rename from include/asm-avr32/errno.h rename to arch/avr32/include/asm/errno.h diff --git a/include/asm-avr32/fb.h b/arch/avr32/include/asm/fb.h similarity index 100% rename from include/asm-avr32/fb.h rename to arch/avr32/include/asm/fb.h diff --git a/include/asm-avr32/fcntl.h b/arch/avr32/include/asm/fcntl.h similarity index 100% rename from include/asm-avr32/fcntl.h rename to arch/avr32/include/asm/fcntl.h diff --git a/include/asm-avr32/futex.h b/arch/avr32/include/asm/futex.h similarity index 100% rename from include/asm-avr32/futex.h rename to arch/avr32/include/asm/futex.h diff --git a/include/asm-avr32/gpio.h b/arch/avr32/include/asm/gpio.h similarity index 100% rename from include/asm-avr32/gpio.h rename to arch/avr32/include/asm/gpio.h diff --git a/include/asm-avr32/hardirq.h b/arch/avr32/include/asm/hardirq.h similarity index 100% rename from include/asm-avr32/hardirq.h rename to arch/avr32/include/asm/hardirq.h diff --git a/include/asm-avr32/hw_irq.h b/arch/avr32/include/asm/hw_irq.h similarity index 100% rename from include/asm-avr32/hw_irq.h rename to arch/avr32/include/asm/hw_irq.h diff --git a/include/asm-avr32/io.h b/arch/avr32/include/asm/io.h similarity index 100% rename from include/asm-avr32/io.h rename to arch/avr32/include/asm/io.h diff --git a/include/asm-avr32/ioctl.h b/arch/avr32/include/asm/ioctl.h similarity index 100% rename from include/asm-avr32/ioctl.h rename to arch/avr32/include/asm/ioctl.h diff --git a/include/asm-avr32/ioctls.h b/arch/avr32/include/asm/ioctls.h similarity index 100% rename from include/asm-avr32/ioctls.h rename to arch/avr32/include/asm/ioctls.h diff --git a/include/asm-avr32/ipcbuf.h b/arch/avr32/include/asm/ipcbuf.h similarity index 100% rename from include/asm-avr32/ipcbuf.h rename to arch/avr32/include/asm/ipcbuf.h diff --git a/include/asm-avr32/irq.h b/arch/avr32/include/asm/irq.h similarity index 100% rename from include/asm-avr32/irq.h rename to arch/avr32/include/asm/irq.h diff --git a/include/asm-avr32/irq_regs.h b/arch/avr32/include/asm/irq_regs.h similarity index 100% rename from include/asm-avr32/irq_regs.h rename to arch/avr32/include/asm/irq_regs.h diff --git a/include/asm-avr32/irqflags.h b/arch/avr32/include/asm/irqflags.h similarity index 100% rename from include/asm-avr32/irqflags.h rename to arch/avr32/include/asm/irqflags.h diff --git a/include/asm-avr32/kdebug.h b/arch/avr32/include/asm/kdebug.h similarity index 100% rename from include/asm-avr32/kdebug.h rename to arch/avr32/include/asm/kdebug.h diff --git a/include/asm-avr32/kmap_types.h b/arch/avr32/include/asm/kmap_types.h similarity index 100% rename from include/asm-avr32/kmap_types.h rename to arch/avr32/include/asm/kmap_types.h diff --git a/include/asm-avr32/kprobes.h b/arch/avr32/include/asm/kprobes.h similarity index 100% rename from include/asm-avr32/kprobes.h rename to arch/avr32/include/asm/kprobes.h diff --git a/include/asm-avr32/linkage.h b/arch/avr32/include/asm/linkage.h similarity index 100% rename from include/asm-avr32/linkage.h rename to arch/avr32/include/asm/linkage.h diff --git a/include/asm-avr32/local.h b/arch/avr32/include/asm/local.h similarity index 100% rename from include/asm-avr32/local.h rename to arch/avr32/include/asm/local.h diff --git a/include/asm-avr32/mach/serial_at91.h b/arch/avr32/include/asm/mach/serial_at91.h similarity index 100% rename from include/asm-avr32/mach/serial_at91.h rename to arch/avr32/include/asm/mach/serial_at91.h diff --git a/include/asm-avr32/mman.h b/arch/avr32/include/asm/mman.h similarity index 100% rename from include/asm-avr32/mman.h rename to arch/avr32/include/asm/mman.h diff --git a/include/asm-avr32/mmu.h b/arch/avr32/include/asm/mmu.h similarity index 100% rename from include/asm-avr32/mmu.h rename to arch/avr32/include/asm/mmu.h diff --git a/include/asm-avr32/mmu_context.h b/arch/avr32/include/asm/mmu_context.h similarity index 100% rename from include/asm-avr32/mmu_context.h rename to arch/avr32/include/asm/mmu_context.h diff --git a/include/asm-avr32/module.h b/arch/avr32/include/asm/module.h similarity index 100% rename from include/asm-avr32/module.h rename to arch/avr32/include/asm/module.h diff --git a/include/asm-avr32/msgbuf.h b/arch/avr32/include/asm/msgbuf.h similarity index 100% rename from include/asm-avr32/msgbuf.h rename to arch/avr32/include/asm/msgbuf.h diff --git a/include/asm-avr32/mutex.h b/arch/avr32/include/asm/mutex.h similarity index 100% rename from include/asm-avr32/mutex.h rename to arch/avr32/include/asm/mutex.h diff --git a/include/asm-avr32/numnodes.h b/arch/avr32/include/asm/numnodes.h similarity index 100% rename from include/asm-avr32/numnodes.h rename to arch/avr32/include/asm/numnodes.h diff --git a/include/asm-avr32/ocd.h b/arch/avr32/include/asm/ocd.h similarity index 100% rename from include/asm-avr32/ocd.h rename to arch/avr32/include/asm/ocd.h diff --git a/include/asm-avr32/page.h b/arch/avr32/include/asm/page.h similarity index 100% rename from include/asm-avr32/page.h rename to arch/avr32/include/asm/page.h diff --git a/include/asm-avr32/param.h b/arch/avr32/include/asm/param.h similarity index 100% rename from include/asm-avr32/param.h rename to arch/avr32/include/asm/param.h diff --git a/include/asm-avr32/pci.h b/arch/avr32/include/asm/pci.h similarity index 100% rename from include/asm-avr32/pci.h rename to arch/avr32/include/asm/pci.h diff --git a/include/asm-avr32/percpu.h b/arch/avr32/include/asm/percpu.h similarity index 100% rename from include/asm-avr32/percpu.h rename to arch/avr32/include/asm/percpu.h diff --git a/include/asm-avr32/pgalloc.h b/arch/avr32/include/asm/pgalloc.h similarity index 100% rename from include/asm-avr32/pgalloc.h rename to arch/avr32/include/asm/pgalloc.h diff --git a/include/asm-avr32/pgtable-2level.h b/arch/avr32/include/asm/pgtable-2level.h similarity index 100% rename from include/asm-avr32/pgtable-2level.h rename to arch/avr32/include/asm/pgtable-2level.h diff --git a/include/asm-avr32/pgtable.h b/arch/avr32/include/asm/pgtable.h similarity index 100% rename from include/asm-avr32/pgtable.h rename to arch/avr32/include/asm/pgtable.h diff --git a/include/asm-avr32/poll.h b/arch/avr32/include/asm/poll.h similarity index 100% rename from include/asm-avr32/poll.h rename to arch/avr32/include/asm/poll.h diff --git a/include/asm-avr32/posix_types.h b/arch/avr32/include/asm/posix_types.h similarity index 100% rename from include/asm-avr32/posix_types.h rename to arch/avr32/include/asm/posix_types.h diff --git a/include/asm-avr32/processor.h b/arch/avr32/include/asm/processor.h similarity index 100% rename from include/asm-avr32/processor.h rename to arch/avr32/include/asm/processor.h diff --git a/include/asm-avr32/ptrace.h b/arch/avr32/include/asm/ptrace.h similarity index 100% rename from include/asm-avr32/ptrace.h rename to arch/avr32/include/asm/ptrace.h diff --git a/include/asm-avr32/resource.h b/arch/avr32/include/asm/resource.h similarity index 100% rename from include/asm-avr32/resource.h rename to arch/avr32/include/asm/resource.h diff --git a/include/asm-avr32/scatterlist.h b/arch/avr32/include/asm/scatterlist.h similarity index 100% rename from include/asm-avr32/scatterlist.h rename to arch/avr32/include/asm/scatterlist.h diff --git a/include/asm-avr32/sections.h b/arch/avr32/include/asm/sections.h similarity index 100% rename from include/asm-avr32/sections.h rename to arch/avr32/include/asm/sections.h diff --git a/include/asm-avr32/sembuf.h b/arch/avr32/include/asm/sembuf.h similarity index 100% rename from include/asm-avr32/sembuf.h rename to arch/avr32/include/asm/sembuf.h diff --git a/include/asm-avr32/serial.h b/arch/avr32/include/asm/serial.h similarity index 100% rename from include/asm-avr32/serial.h rename to arch/avr32/include/asm/serial.h diff --git a/include/asm-avr32/setup.h b/arch/avr32/include/asm/setup.h similarity index 100% rename from include/asm-avr32/setup.h rename to arch/avr32/include/asm/setup.h diff --git a/include/asm-avr32/shmbuf.h b/arch/avr32/include/asm/shmbuf.h similarity index 100% rename from include/asm-avr32/shmbuf.h rename to arch/avr32/include/asm/shmbuf.h diff --git a/include/asm-avr32/shmparam.h b/arch/avr32/include/asm/shmparam.h similarity index 100% rename from include/asm-avr32/shmparam.h rename to arch/avr32/include/asm/shmparam.h diff --git a/include/asm-avr32/sigcontext.h b/arch/avr32/include/asm/sigcontext.h similarity index 100% rename from include/asm-avr32/sigcontext.h rename to arch/avr32/include/asm/sigcontext.h diff --git a/include/asm-avr32/siginfo.h b/arch/avr32/include/asm/siginfo.h similarity index 100% rename from include/asm-avr32/siginfo.h rename to arch/avr32/include/asm/siginfo.h diff --git a/include/asm-avr32/signal.h b/arch/avr32/include/asm/signal.h similarity index 100% rename from include/asm-avr32/signal.h rename to arch/avr32/include/asm/signal.h diff --git a/include/asm-avr32/socket.h b/arch/avr32/include/asm/socket.h similarity index 100% rename from include/asm-avr32/socket.h rename to arch/avr32/include/asm/socket.h diff --git a/include/asm-avr32/sockios.h b/arch/avr32/include/asm/sockios.h similarity index 100% rename from include/asm-avr32/sockios.h rename to arch/avr32/include/asm/sockios.h diff --git a/include/asm-avr32/stat.h b/arch/avr32/include/asm/stat.h similarity index 100% rename from include/asm-avr32/stat.h rename to arch/avr32/include/asm/stat.h diff --git a/include/asm-avr32/statfs.h b/arch/avr32/include/asm/statfs.h similarity index 100% rename from include/asm-avr32/statfs.h rename to arch/avr32/include/asm/statfs.h diff --git a/include/asm-avr32/string.h b/arch/avr32/include/asm/string.h similarity index 100% rename from include/asm-avr32/string.h rename to arch/avr32/include/asm/string.h diff --git a/include/asm-avr32/sysreg.h b/arch/avr32/include/asm/sysreg.h similarity index 100% rename from include/asm-avr32/sysreg.h rename to arch/avr32/include/asm/sysreg.h diff --git a/include/asm-avr32/system.h b/arch/avr32/include/asm/system.h similarity index 100% rename from include/asm-avr32/system.h rename to arch/avr32/include/asm/system.h diff --git a/include/asm-avr32/termbits.h b/arch/avr32/include/asm/termbits.h similarity index 100% rename from include/asm-avr32/termbits.h rename to arch/avr32/include/asm/termbits.h diff --git a/include/asm-avr32/termios.h b/arch/avr32/include/asm/termios.h similarity index 100% rename from include/asm-avr32/termios.h rename to arch/avr32/include/asm/termios.h diff --git a/include/asm-avr32/thread_info.h b/arch/avr32/include/asm/thread_info.h similarity index 100% rename from include/asm-avr32/thread_info.h rename to arch/avr32/include/asm/thread_info.h diff --git a/include/asm-avr32/timex.h b/arch/avr32/include/asm/timex.h similarity index 100% rename from include/asm-avr32/timex.h rename to arch/avr32/include/asm/timex.h diff --git a/include/asm-avr32/tlb.h b/arch/avr32/include/asm/tlb.h similarity index 100% rename from include/asm-avr32/tlb.h rename to arch/avr32/include/asm/tlb.h diff --git a/include/asm-avr32/tlbflush.h b/arch/avr32/include/asm/tlbflush.h similarity index 100% rename from include/asm-avr32/tlbflush.h rename to arch/avr32/include/asm/tlbflush.h diff --git a/include/asm-avr32/topology.h b/arch/avr32/include/asm/topology.h similarity index 100% rename from include/asm-avr32/topology.h rename to arch/avr32/include/asm/topology.h diff --git a/include/asm-avr32/traps.h b/arch/avr32/include/asm/traps.h similarity index 100% rename from include/asm-avr32/traps.h rename to arch/avr32/include/asm/traps.h diff --git a/include/asm-avr32/types.h b/arch/avr32/include/asm/types.h similarity index 100% rename from include/asm-avr32/types.h rename to arch/avr32/include/asm/types.h diff --git a/include/asm-avr32/uaccess.h b/arch/avr32/include/asm/uaccess.h similarity index 100% rename from include/asm-avr32/uaccess.h rename to arch/avr32/include/asm/uaccess.h diff --git a/include/asm-avr32/ucontext.h b/arch/avr32/include/asm/ucontext.h similarity index 100% rename from include/asm-avr32/ucontext.h rename to arch/avr32/include/asm/ucontext.h diff --git a/include/asm-avr32/unaligned.h b/arch/avr32/include/asm/unaligned.h similarity index 100% rename from include/asm-avr32/unaligned.h rename to arch/avr32/include/asm/unaligned.h diff --git a/include/asm-avr32/unistd.h b/arch/avr32/include/asm/unistd.h similarity index 100% rename from include/asm-avr32/unistd.h rename to arch/avr32/include/asm/unistd.h diff --git a/include/asm-avr32/user.h b/arch/avr32/include/asm/user.h similarity index 100% rename from include/asm-avr32/user.h rename to arch/avr32/include/asm/user.h diff --git a/include/asm-avr32/xor.h b/arch/avr32/include/asm/xor.h similarity index 100% rename from include/asm-avr32/xor.h rename to arch/avr32/include/asm/xor.h -- GitLab From 964d219b6a8a79ea4c8d77b6dcdcbbcda403c392 Mon Sep 17 00:00:00 2001 From: Haavard Skinnemoen Date: Tue, 5 Aug 2008 13:49:09 +0200 Subject: [PATCH 05/16] avr32: Introduce arch/avr32/mach-*/include/mach Add arch/avr32/mach-*/include to include search path and copy all the files from include/asm/arch there. The old files will be removed once ARM does the same change and all common drivers are converted. Signed-off-by: Haavard Skinnemoen --- arch/avr32/Makefile | 7 +- .../mach-at32ap/include/mach/at32ap700x.h | 49 +++++++ arch/avr32/mach-at32ap/include/mach/board.h | 121 ++++++++++++++++++ arch/avr32/mach-at32ap/include/mach/cpu.h | 35 +++++ arch/avr32/mach-at32ap/include/mach/gpio.h | 45 +++++++ arch/avr32/mach-at32ap/include/mach/init.h | 18 +++ arch/avr32/mach-at32ap/include/mach/io.h | 39 ++++++ arch/avr32/mach-at32ap/include/mach/irq.h | 14 ++ arch/avr32/mach-at32ap/include/mach/pm.h | 51 ++++++++ arch/avr32/mach-at32ap/include/mach/portmux.h | 29 +++++ arch/avr32/mach-at32ap/include/mach/smc.h | 113 ++++++++++++++++ arch/avr32/mach-at32ap/include/mach/sram.h | 30 +++++ 12 files changed, 550 insertions(+), 1 deletion(-) create mode 100644 arch/avr32/mach-at32ap/include/mach/at32ap700x.h create mode 100644 arch/avr32/mach-at32ap/include/mach/board.h create mode 100644 arch/avr32/mach-at32ap/include/mach/cpu.h create mode 100644 arch/avr32/mach-at32ap/include/mach/gpio.h create mode 100644 arch/avr32/mach-at32ap/include/mach/init.h create mode 100644 arch/avr32/mach-at32ap/include/mach/io.h create mode 100644 arch/avr32/mach-at32ap/include/mach/irq.h create mode 100644 arch/avr32/mach-at32ap/include/mach/pm.h create mode 100644 arch/avr32/mach-at32ap/include/mach/portmux.h create mode 100644 arch/avr32/mach-at32ap/include/mach/smc.h create mode 100644 arch/avr32/mach-at32ap/include/mach/sram.h diff --git a/arch/avr32/Makefile b/arch/avr32/Makefile index 17a3529341dd..5b46433d53a5 100644 --- a/arch/avr32/Makefile +++ b/arch/avr32/Makefile @@ -23,9 +23,14 @@ KBUILD_AFLAGS += $(cpuflags-y) CHECKFLAGS += -D__avr32__ -D__BIG_ENDIAN +machine-$(CONFIG_PLATFORM_AT32AP) := at32ap +machdirs := $(patsubst %,arch/avr32/mach-%/, $(machine-y)) + +KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs)) + head-$(CONFIG_LOADER_U_BOOT) += arch/avr32/boot/u-boot/head.o head-y += arch/avr32/kernel/head.o -core-$(CONFIG_PLATFORM_AT32AP) += arch/avr32/mach-at32ap/ +core-y += $(machdirs) core-$(CONFIG_BOARD_ATSTK1000) += arch/avr32/boards/atstk1000/ core-$(CONFIG_BOARD_ATNGW100) += arch/avr32/boards/atngw100/ core-$(CONFIG_LOADER_U_BOOT) += arch/avr32/boot/u-boot/ diff --git a/arch/avr32/mach-at32ap/include/mach/at32ap700x.h b/arch/avr32/mach-at32ap/include/mach/at32ap700x.h new file mode 100644 index 000000000000..d18a3053be0d --- /dev/null +++ b/arch/avr32/mach-at32ap/include/mach/at32ap700x.h @@ -0,0 +1,49 @@ +/* + * Pin definitions for AT32AP7000. + * + * Copyright (C) 2006 Atmel Corporation + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#ifndef __ASM_ARCH_AT32AP700X_H__ +#define __ASM_ARCH_AT32AP700X_H__ + +#define GPIO_PERIPH_A 0 +#define GPIO_PERIPH_B 1 + +/* + * Pin numbers identifying specific GPIO pins on the chip. They can + * also be converted to IRQ numbers by passing them through + * gpio_to_irq(). + */ +#define GPIO_PIOA_BASE (0) +#define GPIO_PIOB_BASE (GPIO_PIOA_BASE + 32) +#define GPIO_PIOC_BASE (GPIO_PIOB_BASE + 32) +#define GPIO_PIOD_BASE (GPIO_PIOC_BASE + 32) +#define GPIO_PIOE_BASE (GPIO_PIOD_BASE + 32) + +#define GPIO_PIN_PA(N) (GPIO_PIOA_BASE + (N)) +#define GPIO_PIN_PB(N) (GPIO_PIOB_BASE + (N)) +#define GPIO_PIN_PC(N) (GPIO_PIOC_BASE + (N)) +#define GPIO_PIN_PD(N) (GPIO_PIOD_BASE + (N)) +#define GPIO_PIN_PE(N) (GPIO_PIOE_BASE + (N)) + + +/* + * DMAC peripheral hardware handshaking interfaces, used with dw_dmac + */ +#define DMAC_MCI_RX 0 +#define DMAC_MCI_TX 1 +#define DMAC_DAC_TX 2 +#define DMAC_AC97_A_RX 3 +#define DMAC_AC97_A_TX 4 +#define DMAC_AC97_B_RX 5 +#define DMAC_AC97_B_TX 6 +#define DMAC_DMAREQ_0 7 +#define DMAC_DMAREQ_1 8 +#define DMAC_DMAREQ_2 9 +#define DMAC_DMAREQ_3 10 + +#endif /* __ASM_ARCH_AT32AP700X_H__ */ diff --git a/arch/avr32/mach-at32ap/include/mach/board.h b/arch/avr32/mach-at32ap/include/mach/board.h new file mode 100644 index 000000000000..e60e9076544d --- /dev/null +++ b/arch/avr32/mach-at32ap/include/mach/board.h @@ -0,0 +1,121 @@ +/* + * Platform data definitions. + */ +#ifndef __ASM_ARCH_BOARD_H +#define __ASM_ARCH_BOARD_H + +#include + +#define GPIO_PIN_NONE (-1) + +/* + * Clock rates for various on-board oscillators. The number of entries + * in this array is chip-dependent. + */ +extern unsigned long at32_board_osc_rates[]; + +/* Add basic devices: system manager, interrupt controller, portmuxes, etc. */ +void at32_add_system_devices(void); + +#define ATMEL_MAX_UART 4 +extern struct platform_device *atmel_default_console_device; + +struct atmel_uart_data { + short use_dma_tx; /* use transmit DMA? */ + short use_dma_rx; /* use receive DMA? */ + void __iomem *regs; /* virtual base address, if any */ +}; +void at32_map_usart(unsigned int hw_id, unsigned int line); +struct platform_device *at32_add_device_usart(unsigned int id); + +struct eth_platform_data { + u32 phy_mask; + u8 is_rmii; +}; +struct platform_device * +at32_add_device_eth(unsigned int id, struct eth_platform_data *data); + +struct spi_board_info; +struct platform_device * +at32_add_device_spi(unsigned int id, struct spi_board_info *b, unsigned int n); + +struct atmel_lcdfb_info; +struct platform_device * +at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data, + unsigned long fbmem_start, unsigned long fbmem_len, + unsigned int pin_config); + +struct usba_platform_data; +struct platform_device * +at32_add_device_usba(unsigned int id, struct usba_platform_data *data); + +struct ide_platform_data { + u8 cs; +}; +struct platform_device * +at32_add_device_ide(unsigned int id, unsigned int extint, + struct ide_platform_data *data); + +/* mask says which PWM channels to mux */ +struct platform_device *at32_add_device_pwm(u32 mask); + +/* depending on what's hooked up, not all SSC pins will be used */ +#define ATMEL_SSC_TK 0x01 +#define ATMEL_SSC_TF 0x02 +#define ATMEL_SSC_TD 0x04 +#define ATMEL_SSC_TX (ATMEL_SSC_TK | ATMEL_SSC_TF | ATMEL_SSC_TD) + +#define ATMEL_SSC_RK 0x10 +#define ATMEL_SSC_RF 0x20 +#define ATMEL_SSC_RD 0x40 +#define ATMEL_SSC_RX (ATMEL_SSC_RK | ATMEL_SSC_RF | ATMEL_SSC_RD) + +struct platform_device * +at32_add_device_ssc(unsigned int id, unsigned int flags); + +struct i2c_board_info; +struct platform_device *at32_add_device_twi(unsigned int id, + struct i2c_board_info *b, + unsigned int n); + +struct mci_platform_data; +struct platform_device * +at32_add_device_mci(unsigned int id, struct mci_platform_data *data); + +struct ac97c_platform_data { + unsigned short dma_rx_periph_id; + unsigned short dma_tx_periph_id; + unsigned short dma_controller_id; + int reset_pin; +}; +struct platform_device * +at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data); + +struct platform_device *at32_add_device_abdac(unsigned int id); +struct platform_device *at32_add_device_psif(unsigned int id); + +struct cf_platform_data { + int detect_pin; + int reset_pin; + int vcc_pin; + int ready_pin; + u8 cs; +}; +struct platform_device * +at32_add_device_cf(unsigned int id, unsigned int extint, + struct cf_platform_data *data); + +/* NAND / SmartMedia */ +struct atmel_nand_data { + int enable_pin; /* chip enable */ + int det_pin; /* card detect */ + int rdy_pin; /* ready/busy */ + u8 ale; /* address line number connected to ALE */ + u8 cle; /* address line number connected to CLE */ + u8 bus_width_16; /* buswidth is 16 bit */ + struct mtd_partition *(*partition_info)(int size, int *num_partitions); +}; +struct platform_device * +at32_add_device_nand(unsigned int id, struct atmel_nand_data *data); + +#endif /* __ASM_ARCH_BOARD_H */ diff --git a/arch/avr32/mach-at32ap/include/mach/cpu.h b/arch/avr32/mach-at32ap/include/mach/cpu.h new file mode 100644 index 000000000000..44d0bfa1f409 --- /dev/null +++ b/arch/avr32/mach-at32ap/include/mach/cpu.h @@ -0,0 +1,35 @@ +/* + * AVR32 and (fake) AT91 CPU identification + * + * Copyright (C) 2007 Atmel Corporation + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#ifndef __ASM_ARCH_CPU_H +#define __ASM_ARCH_CPU_H + +/* + * Only AT32AP7000 is defined for now. We can identify the specific + * chip at runtime, but I'm not sure if it's really worth it. + */ +#ifdef CONFIG_CPU_AT32AP700X +# define cpu_is_at32ap7000() (1) +#else +# define cpu_is_at32ap7000() (0) +#endif + +/* + * Since this is AVR32, we will never run on any AT91 CPU. But these + * definitions may reduce clutter in common drivers. + */ +#define cpu_is_at91rm9200() (0) +#define cpu_is_at91sam9xe() (0) +#define cpu_is_at91sam9260() (0) +#define cpu_is_at91sam9261() (0) +#define cpu_is_at91sam9263() (0) +#define cpu_is_at91sam9rl() (0) +#define cpu_is_at91cap9() (0) + +#endif /* __ASM_ARCH_CPU_H */ diff --git a/arch/avr32/mach-at32ap/include/mach/gpio.h b/arch/avr32/mach-at32ap/include/mach/gpio.h new file mode 100644 index 000000000000..0180f584ef03 --- /dev/null +++ b/arch/avr32/mach-at32ap/include/mach/gpio.h @@ -0,0 +1,45 @@ +#ifndef __ASM_AVR32_ARCH_GPIO_H +#define __ASM_AVR32_ARCH_GPIO_H + +#include +#include + + +/* Some GPIO chips can manage IRQs; some can't. The exact numbers can + * be changed if needed, but for the moment they're not configurable. + */ +#define ARCH_NR_GPIOS (NR_GPIO_IRQS + 2 * 32) + + +/* Arch-neutral GPIO API, supporting both "native" and external GPIOs. */ +#include + +static inline int gpio_get_value(unsigned int gpio) +{ + return __gpio_get_value(gpio); +} + +static inline void gpio_set_value(unsigned int gpio, int value) +{ + __gpio_set_value(gpio, value); +} + +static inline int gpio_cansleep(unsigned int gpio) +{ + return __gpio_cansleep(gpio); +} + + +static inline int gpio_to_irq(unsigned int gpio) +{ + if (gpio < NR_GPIO_IRQS) + return gpio + GPIO_IRQ_BASE; + return -EINVAL; +} + +static inline int irq_to_gpio(unsigned int irq) +{ + return irq - GPIO_IRQ_BASE; +} + +#endif /* __ASM_AVR32_ARCH_GPIO_H */ diff --git a/arch/avr32/mach-at32ap/include/mach/init.h b/arch/avr32/mach-at32ap/include/mach/init.h new file mode 100644 index 000000000000..bc40e3d46150 --- /dev/null +++ b/arch/avr32/mach-at32ap/include/mach/init.h @@ -0,0 +1,18 @@ +/* + * AT32AP platform initialization calls. + * + * Copyright (C) 2006 Atmel Corporation + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#ifndef __ASM_AVR32_AT32AP_INIT_H__ +#define __ASM_AVR32_AT32AP_INIT_H__ + +void setup_platform(void); +void setup_board(void); + +void at32_setup_serial_console(unsigned int usart_id); + +#endif /* __ASM_AVR32_AT32AP_INIT_H__ */ diff --git a/arch/avr32/mach-at32ap/include/mach/io.h b/arch/avr32/mach-at32ap/include/mach/io.h new file mode 100644 index 000000000000..4ec6abc68ea3 --- /dev/null +++ b/arch/avr32/mach-at32ap/include/mach/io.h @@ -0,0 +1,39 @@ +#ifndef __ASM_AVR32_ARCH_AT32AP_IO_H +#define __ASM_AVR32_ARCH_AT32AP_IO_H + +/* For "bizarre" halfword swapping */ +#include + +#if defined(CONFIG_AP700X_32_BIT_SMC) +# define __swizzle_addr_b(addr) (addr ^ 3UL) +# define __swizzle_addr_w(addr) (addr ^ 2UL) +# define __swizzle_addr_l(addr) (addr) +# define ioswabb(a, x) (x) +# define ioswabw(a, x) (x) +# define ioswabl(a, x) (x) +# define __mem_ioswabb(a, x) (x) +# define __mem_ioswabw(a, x) swab16(x) +# define __mem_ioswabl(a, x) swab32(x) +#elif defined(CONFIG_AP700X_16_BIT_SMC) +# define __swizzle_addr_b(addr) (addr ^ 1UL) +# define __swizzle_addr_w(addr) (addr) +# define __swizzle_addr_l(addr) (addr) +# define ioswabb(a, x) (x) +# define ioswabw(a, x) (x) +# define ioswabl(a, x) swahw32(x) +# define __mem_ioswabb(a, x) (x) +# define __mem_ioswabw(a, x) swab16(x) +# define __mem_ioswabl(a, x) swahb32(x) +#else +# define __swizzle_addr_b(addr) (addr) +# define __swizzle_addr_w(addr) (addr) +# define __swizzle_addr_l(addr) (addr) +# define ioswabb(a, x) (x) +# define ioswabw(a, x) swab16(x) +# define ioswabl(a, x) swab32(x) +# define __mem_ioswabb(a, x) (x) +# define __mem_ioswabw(a, x) (x) +# define __mem_ioswabl(a, x) (x) +#endif + +#endif /* __ASM_AVR32_ARCH_AT32AP_IO_H */ diff --git a/arch/avr32/mach-at32ap/include/mach/irq.h b/arch/avr32/mach-at32ap/include/mach/irq.h new file mode 100644 index 000000000000..608e350368c7 --- /dev/null +++ b/arch/avr32/mach-at32ap/include/mach/irq.h @@ -0,0 +1,14 @@ +#ifndef __ASM_AVR32_ARCH_IRQ_H +#define __ASM_AVR32_ARCH_IRQ_H + +#define EIM_IRQ_BASE NR_INTERNAL_IRQS +#define NR_EIM_IRQS 32 +#define AT32_EXTINT(n) (EIM_IRQ_BASE + (n)) + +#define GPIO_IRQ_BASE (EIM_IRQ_BASE + NR_EIM_IRQS) +#define NR_GPIO_CTLR (5 /*internal*/ + 1 /*external*/) +#define NR_GPIO_IRQS (NR_GPIO_CTLR * 32) + +#define NR_IRQS (GPIO_IRQ_BASE + NR_GPIO_IRQS) + +#endif /* __ASM_AVR32_ARCH_IRQ_H */ diff --git a/arch/avr32/mach-at32ap/include/mach/pm.h b/arch/avr32/mach-at32ap/include/mach/pm.h new file mode 100644 index 000000000000..979b355b77b6 --- /dev/null +++ b/arch/avr32/mach-at32ap/include/mach/pm.h @@ -0,0 +1,51 @@ +/* + * AVR32 AP Power Management. + * + * Copyright (C) 2008 Atmel Corporation + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#ifndef __ASM_AVR32_ARCH_PM_H +#define __ASM_AVR32_ARCH_PM_H + +/* Possible arguments to the "sleep" instruction */ +#define CPU_SLEEP_IDLE 0 +#define CPU_SLEEP_FROZEN 1 +#define CPU_SLEEP_STANDBY 2 +#define CPU_SLEEP_STOP 3 +#define CPU_SLEEP_STATIC 5 + +#ifndef __ASSEMBLY__ +extern void cpu_enter_idle(void); +extern void cpu_enter_standby(unsigned long sdramc_base); + +extern bool disable_idle_sleep; + +static inline void cpu_disable_idle_sleep(void) +{ + disable_idle_sleep = true; +} + +static inline void cpu_enable_idle_sleep(void) +{ + disable_idle_sleep = false; +} + +static inline void cpu_idle_sleep(void) +{ + /* + * If we're using the COUNT and COMPARE registers for + * timekeeping, we can't use the IDLE state. + */ + if (disable_idle_sleep) + cpu_relax(); + else + cpu_enter_idle(); +} + +void intc_set_suspend_handler(unsigned long offset); +#endif + +#endif /* __ASM_AVR32_ARCH_PM_H */ diff --git a/arch/avr32/mach-at32ap/include/mach/portmux.h b/arch/avr32/mach-at32ap/include/mach/portmux.h new file mode 100644 index 000000000000..b1abe6b4e4ef --- /dev/null +++ b/arch/avr32/mach-at32ap/include/mach/portmux.h @@ -0,0 +1,29 @@ +/* + * AT32 portmux interface. + * + * Copyright (C) 2006 Atmel Corporation + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#ifndef __ASM_ARCH_PORTMUX_H__ +#define __ASM_ARCH_PORTMUX_H__ + +/* + * Set up pin multiplexing, called from board init only. + * + * The following flags determine the initial state of the pin. + */ +#define AT32_GPIOF_PULLUP 0x00000001 /* (not-OUT) Enable pull-up */ +#define AT32_GPIOF_OUTPUT 0x00000002 /* (OUT) Enable output driver */ +#define AT32_GPIOF_HIGH 0x00000004 /* (OUT) Set output high */ +#define AT32_GPIOF_DEGLITCH 0x00000008 /* (IN) Filter glitches */ +#define AT32_GPIOF_MULTIDRV 0x00000010 /* Enable multidriver option */ + +void at32_select_periph(unsigned int pin, unsigned int periph, + unsigned long flags); +void at32_select_gpio(unsigned int pin, unsigned long flags); +void at32_reserve_pin(unsigned int pin); + +#endif /* __ASM_ARCH_PORTMUX_H__ */ diff --git a/arch/avr32/mach-at32ap/include/mach/smc.h b/arch/avr32/mach-at32ap/include/mach/smc.h new file mode 100644 index 000000000000..c98eea44a70a --- /dev/null +++ b/arch/avr32/mach-at32ap/include/mach/smc.h @@ -0,0 +1,113 @@ +/* + * Static Memory Controller for AT32 chips + * + * Copyright (C) 2006 Atmel Corporation + * + * Inspired by the OMAP2 General-Purpose Memory Controller interface + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#ifndef __ARCH_AT32AP_SMC_H +#define __ARCH_AT32AP_SMC_H + +/* + * All timing parameters are in nanoseconds. + */ +struct smc_timing { + /* Delay from address valid to assertion of given strobe */ + int ncs_read_setup; + int nrd_setup; + int ncs_write_setup; + int nwe_setup; + + /* Pulse length of given strobe */ + int ncs_read_pulse; + int nrd_pulse; + int ncs_write_pulse; + int nwe_pulse; + + /* Total cycle length of given operation */ + int read_cycle; + int write_cycle; + + /* Minimal recovery times, will extend cycle if needed */ + int ncs_read_recover; + int nrd_recover; + int ncs_write_recover; + int nwe_recover; +}; + +/* + * All timing parameters are in clock cycles. + */ +struct smc_config { + + /* Delay from address valid to assertion of given strobe */ + u8 ncs_read_setup; + u8 nrd_setup; + u8 ncs_write_setup; + u8 nwe_setup; + + /* Pulse length of given strobe */ + u8 ncs_read_pulse; + u8 nrd_pulse; + u8 ncs_write_pulse; + u8 nwe_pulse; + + /* Total cycle length of given operation */ + u8 read_cycle; + u8 write_cycle; + + /* Bus width in bytes */ + u8 bus_width; + + /* + * 0: Data is sampled on rising edge of NCS + * 1: Data is sampled on rising edge of NRD + */ + unsigned int nrd_controlled:1; + + /* + * 0: Data is driven on falling edge of NCS + * 1: Data is driven on falling edge of NWR + */ + unsigned int nwe_controlled:1; + + /* + * 0: NWAIT is disabled + * 1: Reserved + * 2: NWAIT is frozen mode + * 3: NWAIT in ready mode + */ + unsigned int nwait_mode:2; + + /* + * 0: Byte select access type + * 1: Byte write access type + */ + unsigned int byte_write:1; + + /* + * Number of clock cycles before data is released after + * the rising edge of the read controlling signal + * + * Total cycles from SMC is tdf_cycles + 1 + */ + unsigned int tdf_cycles:4; + + /* + * 0: TDF optimization disabled + * 1: TDF optimization enabled + */ + unsigned int tdf_mode:1; +}; + +extern void smc_set_timing(struct smc_config *config, + const struct smc_timing *timing); + +extern int smc_set_configuration(int cs, const struct smc_config *config); +extern struct smc_config *smc_get_configuration(int cs); + +#endif /* __ARCH_AT32AP_SMC_H */ diff --git a/arch/avr32/mach-at32ap/include/mach/sram.h b/arch/avr32/mach-at32ap/include/mach/sram.h new file mode 100644 index 000000000000..4838dae7601a --- /dev/null +++ b/arch/avr32/mach-at32ap/include/mach/sram.h @@ -0,0 +1,30 @@ +/* + * Simple SRAM allocator + * + * Copyright (C) 2008 Atmel Corporation + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#ifndef __ASM_AVR32_ARCH_SRAM_H +#define __ASM_AVR32_ARCH_SRAM_H + +#include + +extern struct gen_pool *sram_pool; + +static inline unsigned long sram_alloc(size_t len) +{ + if (!sram_pool) + return 0UL; + + return gen_pool_alloc(sram_pool, len); +} + +static inline void sram_free(unsigned long addr, size_t len) +{ + return gen_pool_free(sram_pool, addr, len); +} + +#endif /* __ASM_AVR32_ARCH_SRAM_H */ -- GitLab From 3663b736a5083b3bce74520b637f630f01f66a7f Mon Sep 17 00:00:00 2001 From: Haavard Skinnemoen Date: Tue, 5 Aug 2008 13:57:38 +0200 Subject: [PATCH 06/16] avr32: Use instead of Update all avr32-specific files to use the new platform-specific header locations. Drivers shared with ARM are left alone for now. Signed-off-by: Haavard Skinnemoen --- arch/avr32/boards/atngw100/flash.c | 2 +- arch/avr32/boards/atngw100/setup.c | 8 ++++---- arch/avr32/boards/atstk1000/atstk1002.c | 10 +++++----- arch/avr32/boards/atstk1000/atstk1003.c | 8 ++++---- arch/avr32/boards/atstk1000/atstk1004.c | 8 ++++---- arch/avr32/boards/atstk1000/flash.c | 2 +- arch/avr32/boards/atstk1000/setup.c | 6 +++--- arch/avr32/include/asm/gpio.h | 2 +- arch/avr32/include/asm/io.h | 2 +- arch/avr32/include/asm/irq.h | 2 +- arch/avr32/kernel/process.c | 2 +- arch/avr32/kernel/setup.c | 4 ++-- arch/avr32/kernel/time.c | 2 +- arch/avr32/mach-at32ap/at32ap700x.c | 8 ++++---- arch/avr32/mach-at32ap/hsmc.c | 2 +- arch/avr32/mach-at32ap/pio.c | 2 +- arch/avr32/mach-at32ap/pm-at32ap700x.S | 2 +- arch/avr32/mach-at32ap/pm.c | 4 ++-- drivers/ata/pata_at32.c | 4 ++-- drivers/mmc/host/atmel-mci.c | 2 +- 20 files changed, 41 insertions(+), 41 deletions(-) diff --git a/arch/avr32/boards/atngw100/flash.c b/arch/avr32/boards/atngw100/flash.c index b07ae63aa548..55ccc9ce4892 100644 --- a/arch/avr32/boards/atngw100/flash.c +++ b/arch/avr32/boards/atngw100/flash.c @@ -13,7 +13,7 @@ #include #include -#include +#include static struct smc_timing flash_timing __initdata = { .ncs_read_setup = 0, diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c index c7fe94d03a1e..670c87b2db12 100644 --- a/arch/avr32/boards/atngw100/setup.c +++ b/arch/avr32/boards/atngw100/setup.c @@ -23,10 +23,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include /* Oscillator frequencies. These are board-specific */ unsigned long at32_board_osc_rates[3] = { diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c index 8538ba75ef92..b33542b97563 100644 --- a/arch/avr32/boards/atstk1000/atstk1002.c +++ b/arch/avr32/boards/atstk1000/atstk1002.c @@ -23,10 +23,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "atstk1000.h" @@ -49,7 +49,7 @@ unsigned long at32_board_osc_rates[3] = { */ #ifdef CONFIG_BOARD_ATSTK1006 #include -#include +#include static struct smc_timing nand_timing __initdata = { .ncs_read_setup = 0, diff --git a/arch/avr32/boards/atstk1000/atstk1003.c b/arch/avr32/boards/atstk1000/atstk1003.c index 591fc73b554a..0cf664174c17 100644 --- a/arch/avr32/boards/atstk1000/atstk1003.c +++ b/arch/avr32/boards/atstk1000/atstk1003.c @@ -20,10 +20,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include "atstk1000.h" diff --git a/arch/avr32/boards/atstk1000/atstk1004.c b/arch/avr32/boards/atstk1000/atstk1004.c index d9c5e0a21256..50a5273e5916 100644 --- a/arch/avr32/boards/atstk1000/atstk1004.c +++ b/arch/avr32/boards/atstk1000/atstk1004.c @@ -22,10 +22,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include "atstk1000.h" diff --git a/arch/avr32/boards/atstk1000/flash.c b/arch/avr32/boards/atstk1000/flash.c index 3d0a102ad45e..6e4d561977ff 100644 --- a/arch/avr32/boards/atstk1000/flash.c +++ b/arch/avr32/boards/atstk1000/flash.c @@ -13,7 +13,7 @@ #include #include -#include +#include static struct smc_timing flash_timing __initdata = { .ncs_read_setup = 0, diff --git a/arch/avr32/boards/atstk1000/setup.c b/arch/avr32/boards/atstk1000/setup.c index 8bedf93876a3..2d6b560115d9 100644 --- a/arch/avr32/boards/atstk1000/setup.c +++ b/arch/avr32/boards/atstk1000/setup.c @@ -18,9 +18,9 @@ #include -#include -#include -#include +#include +#include +#include #include "atstk1000.h" diff --git a/arch/avr32/include/asm/gpio.h b/arch/avr32/include/asm/gpio.h index 19e8ccc77db3..b771f7105964 100644 --- a/arch/avr32/include/asm/gpio.h +++ b/arch/avr32/include/asm/gpio.h @@ -1,6 +1,6 @@ #ifndef __ASM_AVR32_GPIO_H #define __ASM_AVR32_GPIO_H -#include +#include #endif /* __ASM_AVR32_GPIO_H */ diff --git a/arch/avr32/include/asm/io.h b/arch/avr32/include/asm/io.h index 8be7ea9c9047..a520f77ead96 100644 --- a/arch/avr32/include/asm/io.h +++ b/arch/avr32/include/asm/io.h @@ -8,7 +8,7 @@ #include #include -#include +#include /* virt_to_phys will only work when address is in P1 or P2 */ static __inline__ unsigned long virt_to_phys(volatile void *address) diff --git a/arch/avr32/include/asm/irq.h b/arch/avr32/include/asm/irq.h index c563b7720c1a..6fa8913f8548 100644 --- a/arch/avr32/include/asm/irq.h +++ b/arch/avr32/include/asm/irq.h @@ -3,7 +3,7 @@ #define NR_INTERNAL_IRQS 64 -#include +#include #ifndef NR_IRQS #define NR_IRQS (NR_INTERNAL_IRQS) diff --git a/arch/avr32/kernel/process.c b/arch/avr32/kernel/process.c index ff820a9e743a..2c08ac992ac3 100644 --- a/arch/avr32/kernel/process.c +++ b/arch/avr32/kernel/process.c @@ -18,7 +18,7 @@ #include #include -#include +#include void (*pm_power_off)(void) = NULL; EXPORT_SYMBOL(pm_power_off); diff --git a/arch/avr32/kernel/setup.c b/arch/avr32/kernel/setup.c index ce48c14f4349..d8e623c426c1 100644 --- a/arch/avr32/kernel/setup.c +++ b/arch/avr32/kernel/setup.c @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include extern int root_mountflags; diff --git a/arch/avr32/kernel/time.c b/arch/avr32/kernel/time.c index 7e7f32771ae1..283481d74a5b 100644 --- a/arch/avr32/kernel/time.c +++ b/arch/avr32/kernel/time.c @@ -15,7 +15,7 @@ #include -#include +#include static cycle_t read_cycle_count(void) diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c index 1617048c86c5..92bfb4d8ae45 100644 --- a/arch/avr32/mach-at32ap/at32ap700x.c +++ b/arch/avr32/mach-at32ap/at32ap700x.c @@ -20,10 +20,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include