tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[ARM] Move AMBA include files to include/linux/amba/

Since the ARM AMBA bus is used on MIPS as well as ARM, we need
to make the bus available for other architectures to use. Move
the AMBA include files from include/asm-arm/hardware/ to
include/linux/amba/

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Russell King and committed by
Russell King a62c80e5 6351610d

+35 -35
+1 -1
arch/arm/common/amba.c
··· 12 12 #include <linux/device.h> 13 13 #include <linux/string.h> 14 14 #include <linux/slab.h> 15 + #include <linux/amba/bus.h> 15 16 16 17 #include <asm/io.h> 17 18 #include <asm/irq.h> 18 - #include <asm/hardware/amba.h> 19 19 #include <asm/sizes.h> 20 20 21 21 #define to_amba_device(d) container_of(d, struct amba_device, dev)
+1 -1
arch/arm/mach-aaec2000/core.c
··· 20 20 #include <linux/interrupt.h> 21 21 #include <linux/timex.h> 22 22 #include <linux/signal.h> 23 + #include <linux/amba/bus.h> 23 24 24 25 #include <asm/hardware.h> 25 26 #include <asm/irq.h> 26 27 #include <asm/sizes.h> 27 - #include <asm/hardware/amba.h> 28 28 29 29 #include <asm/mach/flash.h> 30 30 #include <asm/mach/irq.h>
+1 -1
arch/arm/mach-aaec2000/core.h
··· 9 9 * 10 10 */ 11 11 12 - #include <asm/hardware/amba_clcd.h> 12 + #include <linux/amba/clcd.h> 13 13 14 14 struct sys_timer; 15 15
+1 -1
arch/arm/mach-integrator/core.c
··· 15 15 #include <linux/interrupt.h> 16 16 #include <linux/sched.h> 17 17 #include <linux/smp.h> 18 + #include <linux/amba/bus.h> 18 19 19 20 #include <asm/hardware.h> 20 21 #include <asm/irq.h> 21 22 #include <asm/io.h> 22 - #include <asm/hardware/amba.h> 23 23 #include <asm/hardware/arm_timer.h> 24 24 #include <asm/arch/cm.h> 25 25 #include <asm/system.h>
+2 -2
arch/arm/mach-integrator/impd1.c
··· 18 18 #include <linux/device.h> 19 19 #include <linux/errno.h> 20 20 #include <linux/mm.h> 21 + #include <linux/amba/bus.h> 22 + #include <linux/amba/clcd.h> 21 23 22 24 #include <asm/io.h> 23 25 #include <asm/hardware/icst525.h> 24 - #include <asm/hardware/amba.h> 25 - #include <asm/hardware/amba_clcd.h> 26 26 #include <asm/arch/lm.h> 27 27 #include <asm/arch/impd1.h> 28 28 #include <asm/sizes.h>
+2 -2
arch/arm/mach-integrator/integrator_ap.c
··· 25 25 #include <linux/slab.h> 26 26 #include <linux/string.h> 27 27 #include <linux/sysdev.h> 28 + #include <linux/amba/bus.h> 29 + #include <linux/amba/kmi.h> 28 30 29 31 #include <asm/hardware.h> 30 32 #include <asm/io.h> ··· 34 32 #include <asm/setup.h> 35 33 #include <asm/param.h> /* HZ */ 36 34 #include <asm/mach-types.h> 37 - #include <asm/hardware/amba.h> 38 - #include <asm/hardware/amba_kmi.h> 39 35 40 36 #include <asm/arch/lm.h> 41 37
+3 -3
arch/arm/mach-integrator/integrator_cp.c
··· 16 16 #include <linux/slab.h> 17 17 #include <linux/string.h> 18 18 #include <linux/sysdev.h> 19 + #include <linux/amba/bus.h> 20 + #include <linux/amba/kmi.h> 21 + #include <linux/amba/clcd.h> 19 22 20 23 #include <asm/hardware.h> 21 24 #include <asm/io.h> 22 25 #include <asm/irq.h> 23 26 #include <asm/setup.h> 24 27 #include <asm/mach-types.h> 25 - #include <asm/hardware/amba.h> 26 - #include <asm/hardware/amba_kmi.h> 27 - #include <asm/hardware/amba_clcd.h> 28 28 #include <asm/hardware/icst525.h> 29 29 30 30 #include <asm/arch/cm.h>
+1 -1
arch/arm/mach-integrator/time.c
··· 14 14 #include <linux/interrupt.h> 15 15 #include <linux/init.h> 16 16 #include <linux/device.h> 17 + #include <linux/amba/bus.h> 17 18 18 - #include <asm/hardware/amba.h> 19 19 #include <asm/hardware.h> 20 20 #include <asm/io.h> 21 21 #include <asm/uaccess.h>
+2 -2
arch/arm/mach-realview/core.c
··· 24 24 #include <linux/dma-mapping.h> 25 25 #include <linux/sysdev.h> 26 26 #include <linux/interrupt.h> 27 + #include <linux/amba/bus.h> 28 + #include <linux/amba/clcd.h> 27 29 28 30 #include <asm/system.h> 29 31 #include <asm/hardware.h> 30 32 #include <asm/io.h> 31 33 #include <asm/irq.h> 32 34 #include <asm/leds.h> 33 - #include <asm/hardware/amba.h> 34 - #include <asm/hardware/amba_clcd.h> 35 35 #include <asm/hardware/arm_timer.h> 36 36 #include <asm/hardware/icst307.h> 37 37
+2 -1
arch/arm/mach-realview/core.h
··· 22 22 #ifndef __ASM_ARCH_REALVIEW_H 23 23 #define __ASM_ARCH_REALVIEW_H 24 24 25 - #include <asm/hardware/amba.h> 25 + #include <linux/amba/bus.h> 26 + 26 27 #include <asm/leds.h> 27 28 #include <asm/io.h> 28 29
+1 -1
arch/arm/mach-realview/realview_eb.c
··· 23 23 #include <linux/init.h> 24 24 #include <linux/platform_device.h> 25 25 #include <linux/sysdev.h> 26 + #include <linux/amba/bus.h> 26 27 27 28 #include <asm/hardware.h> 28 29 #include <asm/io.h> ··· 31 30 #include <asm/leds.h> 32 31 #include <asm/mach-types.h> 33 32 #include <asm/hardware/gic.h> 34 - #include <asm/hardware/amba.h> 35 33 #include <asm/hardware/icst307.h> 36 34 37 35 #include <asm/mach/arch.h>
+2 -2
arch/arm/mach-versatile/core.c
··· 25 25 #include <linux/platform_device.h> 26 26 #include <linux/sysdev.h> 27 27 #include <linux/interrupt.h> 28 + #include <linux/amba/bus.h> 29 + #include <linux/amba/clcd.h> 28 30 29 31 #include <asm/system.h> 30 32 #include <asm/hardware.h> 31 33 #include <asm/io.h> 32 34 #include <asm/irq.h> 33 35 #include <asm/leds.h> 34 - #include <asm/hardware/amba.h> 35 - #include <asm/hardware/amba_clcd.h> 36 36 #include <asm/hardware/arm_timer.h> 37 37 #include <asm/hardware/icst307.h> 38 38
+1 -1
arch/arm/mach-versatile/core.h
··· 22 22 #ifndef __ASM_ARCH_VERSATILE_H 23 23 #define __ASM_ARCH_VERSATILE_H 24 24 25 - #include <asm/hardware/amba.h> 25 + #include <linux/amba/bus.h> 26 26 27 27 extern void __init versatile_init(void); 28 28 extern void __init versatile_init_irq(void);
+1 -1
arch/arm/mach-versatile/versatile_ab.c
··· 23 23 #include <linux/init.h> 24 24 #include <linux/device.h> 25 25 #include <linux/sysdev.h> 26 + #include <linux/amba/bus.h> 26 27 27 28 #include <asm/hardware.h> 28 29 #include <asm/io.h> 29 30 #include <asm/irq.h> 30 31 #include <asm/mach-types.h> 31 - #include <asm/hardware/amba.h> 32 32 33 33 #include <asm/mach/arch.h> 34 34
+1 -1
arch/arm/mach-versatile/versatile_pb.c
··· 23 23 #include <linux/init.h> 24 24 #include <linux/device.h> 25 25 #include <linux/sysdev.h> 26 + #include <linux/amba/bus.h> 26 27 27 28 #include <asm/hardware.h> 28 29 #include <asm/io.h> 29 30 #include <asm/irq.h> 30 31 #include <asm/mach-types.h> 31 - #include <asm/hardware/amba.h> 32 32 33 33 #include <asm/mach/arch.h> 34 34 #include <asm/mach/mmc.h>
+2 -2
drivers/input/serio/ambakmi.c
··· 19 19 #include <linux/delay.h> 20 20 #include <linux/slab.h> 21 21 #include <linux/err.h> 22 + #include <linux/amba/bus.h> 23 + #include <linux/amba/kmi.h> 22 24 23 25 #include <asm/io.h> 24 26 #include <asm/irq.h> 25 - #include <asm/hardware/amba.h> 26 - #include <asm/hardware/amba_kmi.h> 27 27 #include <asm/hardware/clock.h> 28 28 29 29 #define KMI_BASE (kmi->base)
+1 -1
drivers/mmc/mmci.c
··· 19 19 #include <linux/highmem.h> 20 20 #include <linux/mmc/host.h> 21 21 #include <linux/mmc/protocol.h> 22 + #include <linux/amba/bus.h> 22 23 23 24 #include <asm/div64.h> 24 25 #include <asm/io.h> 25 26 #include <asm/scatterlist.h> 26 27 #include <asm/sizes.h> 27 - #include <asm/hardware/amba.h> 28 28 #include <asm/hardware/clock.h> 29 29 #include <asm/mach/mmc.h> 30 30
+2 -2
drivers/serial/amba-pl010.c
··· 47 47 #include <linux/tty_flip.h> 48 48 #include <linux/serial_core.h> 49 49 #include <linux/serial.h> 50 + #include <linux/amba/bus.h> 51 + #include <linux/amba/serial.h> 50 52 51 53 #include <asm/io.h> 52 54 #include <asm/irq.h> 53 55 #include <asm/hardware.h> 54 - #include <asm/hardware/amba.h> 55 - #include <asm/hardware/amba_serial.h> 56 56 57 57 #define UART_NR 2 58 58
+2 -2
drivers/serial/amba-pl011.c
··· 47 47 #include <linux/tty_flip.h> 48 48 #include <linux/serial_core.h> 49 49 #include <linux/serial.h> 50 + #include <linux/amba/bus.h> 51 + #include <linux/amba/serial.h> 50 52 51 53 #include <asm/io.h> 52 54 #include <asm/sizes.h> 53 - #include <asm/hardware/amba.h> 54 55 #include <asm/hardware/clock.h> 55 - #include <asm/hardware/amba_serial.h> 56 56 57 57 #define UART_NR 14 58 58
+2 -3
drivers/video/amba-clcd.c
··· 21 21 #include <linux/init.h> 22 22 #include <linux/ioport.h> 23 23 #include <linux/list.h> 24 + #include <linux/amba/bus.h> 25 + #include <linux/amba/clcd.h> 24 26 25 27 #include <asm/sizes.h> 26 - #include <asm/hardware/amba.h> 27 28 #include <asm/hardware/clock.h> 28 - 29 - #include <asm/hardware/amba_clcd.h> 30 29 31 30 #define to_clcd(info) container_of(info, struct clcd_fb, fb) 32 31
+1 -1
include/asm-arm/arch-integrator/debug-macro.S
··· 11 11 * 12 12 */ 13 13 14 - #include <asm/hardware/amba_serial.h> 14 + #include <linux/amba/serial.h> 15 15 16 16 .macro addruart,rx 17 17 mrc p15, 0, \rx, c1, c0
+1 -1
include/asm-arm/arch-realview/debug-macro.S
··· 11 11 * 12 12 */ 13 13 14 - #include <asm/hardware/amba_serial.h> 14 + #include <linux/amba/serial.h> 15 15 16 16 .macro addruart,rx 17 17 mrc p15, 0, \rx, c1, c0
+1 -1
include/asm-arm/arch-versatile/debug-macro.S
··· 11 11 * 12 12 */ 13 13 14 - #include <asm/hardware/amba_serial.h> 14 + #include <linux/amba/serial.h> 15 15 16 16 .macro addruart,rx 17 17 mrc p15, 0, \rx, c1, c0
include/asm-arm/hardware/amba.h include/linux/amba/bus.h
include/asm-arm/hardware/amba_clcd.h include/linux/amba/clcd.h
include/asm-arm/hardware/amba_kmi.h include/linux/amba/kmi.h
include/asm-arm/hardware/amba_serial.h include/linux/amba/serial.h
+1 -1
sound/arm/aaci.c
··· 17 17 #include <linux/spinlock.h> 18 18 #include <linux/interrupt.h> 19 19 #include <linux/err.h> 20 + #include <linux/amba/bus.h> 20 21 21 22 #include <asm/io.h> 22 23 #include <asm/irq.h> 23 24 #include <asm/sizes.h> 24 - #include <asm/hardware/amba.h> 25 25 26 26 #include <sound/driver.h> 27 27 #include <sound/core.h>