diff options
Diffstat (limited to '')
29 files changed, 46 insertions, 30 deletions
diff --git a/arch/arm/mach-ep93xx/adssphere.c b/arch/arm/mach-ep93xx/adssphere.c index 8f87f8a41483..aa1fb352fb8f 100644 --- a/arch/arm/mach-ep93xx/adssphere.c +++ b/arch/arm/mach-ep93xx/adssphere.c @@ -19,7 +19,7 @@ #include <linux/mtd/physmap.h> #include <linux/platform_device.h> #include <asm/io.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c index 4642c70f21e0..6062e47f2043 100644 --- a/arch/arm/mach-ep93xx/clock.c +++ b/arch/arm/mach-ep93xx/clock.c @@ -16,7 +16,7 @@ #include <linux/module.h> #include <linux/string.h> #include <asm/div64.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> struct clk { diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index b49da117af9b..f99f43669392 100644 --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c @@ -36,7 +36,7 @@ #include <asm/types.h> #include <asm/setup.h> #include <asm/memory.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/irq.h> #include <asm/system.h> #include <asm/tlbflush.h> @@ -46,7 +46,7 @@ #include <asm/mach/map.h> #include <asm/mach/time.h> #include <asm/mach/irq.h> -#include <asm/arch/gpio.h> +#include <mach/gpio.h> #include <asm/hardware/vic.h> diff --git a/arch/arm/mach-ep93xx/edb9302.c b/arch/arm/mach-ep93xx/edb9302.c index 1650ec724228..97550c0ad7b0 100644 --- a/arch/arm/mach-ep93xx/edb9302.c +++ b/arch/arm/mach-ep93xx/edb9302.c @@ -19,7 +19,7 @@ #include <linux/mtd/physmap.h> #include <linux/platform_device.h> #include <asm/io.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> diff --git a/arch/arm/mach-ep93xx/edb9302a.c b/arch/arm/mach-ep93xx/edb9302a.c index 00208ce6e620..99b01d44bf1c 100644 --- a/arch/arm/mach-ep93xx/edb9302a.c +++ b/arch/arm/mach-ep93xx/edb9302a.c @@ -19,7 +19,7 @@ #include <linux/mtd/physmap.h> #include <linux/platform_device.h> #include <asm/io.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> diff --git a/arch/arm/mach-ep93xx/edb9307.c b/arch/arm/mach-ep93xx/edb9307.c index 78d04aeca463..9fb72d01a36c 100644 --- a/arch/arm/mach-ep93xx/edb9307.c +++ b/arch/arm/mach-ep93xx/edb9307.c @@ -19,7 +19,7 @@ #include <linux/mtd/physmap.h> #include <linux/platform_device.h> #include <asm/io.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> diff --git a/arch/arm/mach-ep93xx/edb9312.c b/arch/arm/mach-ep93xx/edb9312.c index d658fb2f574b..87267a574f5e 100644 --- a/arch/arm/mach-ep93xx/edb9312.c +++ b/arch/arm/mach-ep93xx/edb9312.c @@ -20,7 +20,7 @@ #include <linux/mtd/physmap.h> #include <linux/platform_device.h> #include <asm/io.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> diff --git a/arch/arm/mach-ep93xx/edb9315.c b/arch/arm/mach-ep93xx/edb9315.c index 4fd1cd671521..7e373950be4d 100644 --- a/arch/arm/mach-ep93xx/edb9315.c +++ b/arch/arm/mach-ep93xx/edb9315.c @@ -19,7 +19,7 @@ #include <linux/mtd/physmap.h> #include <linux/platform_device.h> #include <asm/io.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> diff --git a/arch/arm/mach-ep93xx/edb9315a.c b/arch/arm/mach-ep93xx/edb9315a.c index 44dacbac8635..08a7c9bfb689 100644 --- a/arch/arm/mach-ep93xx/edb9315a.c +++ b/arch/arm/mach-ep93xx/edb9315a.c @@ -19,7 +19,7 @@ #include <linux/mtd/physmap.h> #include <linux/platform_device.h> #include <asm/io.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> diff --git a/arch/arm/mach-ep93xx/gesbc9312.c b/arch/arm/mach-ep93xx/gesbc9312.c index cc80031b4ef8..9b41ec1f089e 100644 --- a/arch/arm/mach-ep93xx/gesbc9312.c +++ b/arch/arm/mach-ep93xx/gesbc9312.c @@ -19,7 +19,7 @@ #include <linux/mtd/physmap.h> #include <linux/platform_device.h> #include <asm/io.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> diff --git a/arch/arm/mach-ep93xx/gpio.c b/arch/arm/mach-ep93xx/gpio.c index dc2e4c00d989..0f3fb87ca4be 100644 --- a/arch/arm/mach-ep93xx/gpio.c +++ b/arch/arm/mach-ep93xx/gpio.c @@ -17,7 +17,7 @@ #include <linux/module.h> #include <linux/seq_file.h> -#include <asm/arch/ep93xx-regs.h> +#include <mach/ep93xx-regs.h> #include <asm/io.h> #include <asm/gpio.h> diff --git a/include/asm-arm/arch-ep93xx/debug-macro.S b/arch/arm/mach-ep93xx/include/mach/debug-macro.S index 397565a0c671..802858bc8095 100644 --- a/include/asm-arm/arch-ep93xx/debug-macro.S +++ b/arch/arm/mach-ep93xx/include/mach/debug-macro.S @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ep93xx/debug-macro.S + * arch/arm/mach-ep93xx/include/mach/debug-macro.S * Debugging macro include header * * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org> @@ -9,7 +9,7 @@ * the Free Software Foundation; either version 2 of the License, or (at * your option) any later version. */ -#include <asm/arch/ep93xx-regs.h> +#include <mach/ep93xx-regs.h> .macro addruart,rx mrc p15, 0, \rx, c1, c0 diff --git a/arch/arm/mach-ep93xx/include/mach/dma.h b/arch/arm/mach-ep93xx/include/mach/dma.h new file mode 100644 index 000000000000..d0fa9656e92f --- /dev/null +++ b/arch/arm/mach-ep93xx/include/mach/dma.h @@ -0,0 +1,3 @@ +/* + * arch/arm/mach-ep93xx/include/mach/dma.h + */ diff --git a/include/asm-arm/arch-ep93xx/entry-macro.S b/arch/arm/mach-ep93xx/include/mach/entry-macro.S index 241ec221a047..96b85e2c2c0b 100644 --- a/include/asm-arm/arch-ep93xx/entry-macro.S +++ b/arch/arm/mach-ep93xx/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ep93xx/entry-macro.S + * arch/arm/mach-ep93xx/include/mach/entry-macro.S * IRQ demultiplexing for EP93xx * * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org> @@ -9,7 +9,7 @@ * the Free Software Foundation; either version 2 of the License, or (at * your option) any later version. */ -#include <asm/arch/ep93xx-regs.h> +#include <mach/ep93xx-regs.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-ep93xx/ep93xx-regs.h b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h index 625c6f0abc03..9f4458c8e070 100644 --- a/include/asm-arm/arch-ep93xx/ep93xx-regs.h +++ b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ep93xx/ep93xx-regs.h + * arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h */ #ifndef __ASM_ARCH_EP93XX_REGS_H diff --git a/arch/arm/mach-ep93xx/include/mach/gesbc9312.h b/arch/arm/mach-ep93xx/include/mach/gesbc9312.h new file mode 100644 index 000000000000..21fe2b922aa5 --- /dev/null +++ b/arch/arm/mach-ep93xx/include/mach/gesbc9312.h @@ -0,0 +1,3 @@ +/* + * arch/arm/mach-ep93xx/include/mach/gesbc9312.h + */ diff --git a/include/asm-arm/arch-ep93xx/gpio.h b/arch/arm/mach-ep93xx/include/mach/gpio.h index 186e7c715f8a..f7020414c5df 100644 --- a/include/asm-arm/arch-ep93xx/gpio.h +++ b/arch/arm/mach-ep93xx/include/mach/gpio.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ep93xx/gpio.h + * arch/arm/mach-ep93xx/include/mach/gpio.h */ #ifndef __ASM_ARCH_GPIO_H diff --git a/include/asm-arm/arch-ep93xx/hardware.h b/arch/arm/mach-ep93xx/include/mach/hardware.h index 4233f6e85150..529807d182bf 100644 --- a/include/asm-arm/arch-ep93xx/hardware.h +++ b/arch/arm/mach-ep93xx/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ep93xx/hardware.h + * arch/arm/mach-ep93xx/include/mach/hardware.h */ #ifndef __ASM_ARCH_HARDWARE_H #define __ASM_ARCH_HARDWARE_H diff --git a/include/asm-arm/arch-ep93xx/io.h b/arch/arm/mach-ep93xx/include/mach/io.h index 7b4d25e29060..1ab9a90ad339 100644 --- a/include/asm-arm/arch-ep93xx/io.h +++ b/arch/arm/mach-ep93xx/include/mach/io.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ep93xx/io.h + * arch/arm/mach-ep93xx/include/mach/io.h */ #define IO_SPACE_LIMIT 0xffffffff diff --git a/include/asm-arm/arch-ep93xx/irqs.h b/arch/arm/mach-ep93xx/include/mach/irqs.h index 53d4a68bfc88..ff98390bbf0f 100644 --- a/include/asm-arm/arch-ep93xx/irqs.h +++ b/arch/arm/mach-ep93xx/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ep93xx/irqs.h + * arch/arm/mach-ep93xx/include/mach/irqs.h */ #ifndef __ASM_ARCH_IRQS_H diff --git a/include/asm-arm/arch-ep93xx/memory.h b/arch/arm/mach-ep93xx/include/mach/memory.h index 4b1a5c7c8363..f1b633590752 100644 --- a/include/asm-arm/arch-ep93xx/memory.h +++ b/arch/arm/mach-ep93xx/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ep93xx/memory.h + * arch/arm/mach-ep93xx/include/mach/memory.h */ #ifndef __ASM_ARCH_MEMORY_H diff --git a/include/asm-arm/arch-ep93xx/platform.h b/arch/arm/mach-ep93xx/include/mach/platform.h index 44eccec2cba4..b5c182473f5d 100644 --- a/include/asm-arm/arch-ep93xx/platform.h +++ b/arch/arm/mach-ep93xx/include/mach/platform.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ep93xx/platform.h + * arch/arm/mach-ep93xx/include/mach/platform.h */ #ifndef __ASSEMBLY__ diff --git a/include/asm-arm/arch-ep93xx/system.h b/arch/arm/mach-ep93xx/include/mach/system.h index f1a5acf51919..67789d0f329e 100644 --- a/include/asm-arm/arch-ep93xx/system.h +++ b/arch/arm/mach-ep93xx/include/mach/system.h @@ -1,8 +1,8 @@ /* - * linux/include/asm-arm/arch-ep93xx/system.h + * arch/arm/mach-ep93xx/include/mach/system.h */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> static inline void arch_idle(void) { diff --git a/arch/arm/mach-ep93xx/include/mach/timex.h b/arch/arm/mach-ep93xx/include/mach/timex.h new file mode 100644 index 000000000000..6b3503b01fa6 --- /dev/null +++ b/arch/arm/mach-ep93xx/include/mach/timex.h @@ -0,0 +1,5 @@ +/* + * arch/arm/mach-ep93xx/include/mach/timex.h + */ + +#define CLOCK_TICK_RATE 983040 diff --git a/include/asm-arm/arch-ep93xx/ts72xx.h b/arch/arm/mach-ep93xx/include/mach/ts72xx.h index a94f63ff0535..30b318aa1a1f 100644 --- a/include/asm-arm/arch-ep93xx/ts72xx.h +++ b/arch/arm/mach-ep93xx/include/mach/ts72xx.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ep93xx/ts72xx.h + * arch/arm/mach-ep93xx/include/mach/ts72xx.h */ /* diff --git a/include/asm-arm/arch-ep93xx/uncompress.h b/arch/arm/mach-ep93xx/include/mach/uncompress.h index c15274c85d5d..1fd2f17de325 100644 --- a/include/asm-arm/arch-ep93xx/uncompress.h +++ b/arch/arm/mach-ep93xx/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-ep93xx/uncompress.h + * arch/arm/mach-ep93xx/include/mach/uncompress.h * * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org> * @@ -9,7 +9,7 @@ * your option) any later version. */ -#include <asm/arch/ep93xx-regs.h> +#include <mach/ep93xx-regs.h> static unsigned char __raw_readb(unsigned int ptr) { diff --git a/arch/arm/mach-ep93xx/include/mach/vmalloc.h b/arch/arm/mach-ep93xx/include/mach/vmalloc.h new file mode 100644 index 000000000000..aed21cd3fe2d --- /dev/null +++ b/arch/arm/mach-ep93xx/include/mach/vmalloc.h @@ -0,0 +1,5 @@ +/* + * arch/arm/mach-ep93xx/include/mach/vmalloc.h + */ + +#define VMALLOC_END 0xfe800000 diff --git a/arch/arm/mach-ep93xx/micro9.c b/arch/arm/mach-ep93xx/micro9.c index 4d831ba799d5..de047a5c8112 100644 --- a/arch/arm/mach-ep93xx/micro9.c +++ b/arch/arm/mach-ep93xx/micro9.c @@ -20,7 +20,7 @@ #include <linux/mtd/physmap.h> #include <asm/io.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/mach/arch.h> #include <asm/mach-types.h> diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c index c0bc642a5c18..c3cbff126d0c 100644 --- a/arch/arm/mach-ep93xx/ts72xx.c +++ b/arch/arm/mach-ep93xx/ts72xx.c @@ -20,7 +20,7 @@ #include <linux/platform_device.h> #include <linux/m48t86.h> #include <asm/io.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> |