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] 3/4: Remove asm/hardware.h from Versatile and Integrator io.h

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

authored by

Russell King and committed by
Russell King c6b8fdad 766529fa

+13 -13
+1
drivers/mmc/mmci.c
··· 24 24 #include <asm/io.h> 25 25 #include <asm/irq.h> 26 26 #include <asm/scatterlist.h> 27 + #include <asm/sizes.h> 27 28 #include <asm/hardware/amba.h> 28 29 #include <asm/hardware/clock.h> 29 30 #include <asm/mach/mmc.h>
+1
drivers/serial/amba-pl010.c
··· 50 50 51 51 #include <asm/io.h> 52 52 #include <asm/irq.h> 53 + #include <asm/hardware.h> 53 54 #include <asm/hardware/amba.h> 54 55 #include <asm/hardware/amba_serial.h> 55 56
+1
drivers/serial/amba-pl011.c
··· 50 50 51 51 #include <asm/io.h> 52 52 #include <asm/irq.h> 53 + #include <asm/sizes.h> 53 54 #include <asm/hardware/amba.h> 54 55 #include <asm/hardware/clock.h> 55 56 #include <asm/hardware/amba_serial.h>
+1
drivers/video/amba-clcd.c
··· 22 22 #include <linux/ioport.h> 23 23 #include <linux/list.h> 24 24 25 + #include <asm/sizes.h> 25 26 #include <asm/hardware/amba.h> 26 27 #include <asm/hardware/clock.h> 27 28
-9
include/asm-arm/arch-integrator/hardware.h
··· 33 33 #define IO_SIZE 0x0B000000 // How much? 34 34 #define IO_START INTEGRATOR_HDR_BASE // PA of IO 35 35 36 - /* 37 - * Similar to above, but for PCI addresses (memory, IO, Config and the 38 - * V3 chip itself). WARNING: this has to mirror definitions in platform.h 39 - */ 40 - #define PCI_MEMORY_VADDR 0xe8000000 41 - #define PCI_CONFIG_VADDR 0xec000000 42 - #define PCI_V3_VADDR 0xed000000 43 - #define PCI_IO_VADDR 0xee000000 44 - 45 36 #define PCIO_BASE PCI_IO_VADDR 46 37 #define PCIMEM_BASE PCI_MEMORY_VADDR 47 38
+8 -2
include/asm-arm/arch-integrator/io.h
··· 20 20 #ifndef __ASM_ARM_ARCH_IO_H 21 21 #define __ASM_ARM_ARCH_IO_H 22 22 23 - #include <asm/hardware.h> 24 - 25 23 #define IO_SPACE_LIMIT 0xffff 24 + 25 + /* 26 + * WARNING: this has to mirror definitions in platform.h 27 + */ 28 + #define PCI_MEMORY_VADDR 0xe8000000 29 + #define PCI_CONFIG_VADDR 0xec000000 30 + #define PCI_V3_VADDR 0xed000000 31 + #define PCI_IO_VADDR 0xee000000 26 32 27 33 #define __io(a) ((void __iomem *)(PCI_IO_VADDR + (a))) 28 34 #define __mem_pci(a) (a)
-2
include/asm-arm/arch-versatile/io.h
··· 20 20 #ifndef __ASM_ARM_ARCH_IO_H 21 21 #define __ASM_ARM_ARCH_IO_H 22 22 23 - #include <asm/hardware.h> 24 - 25 23 #define IO_SPACE_LIMIT 0xffffffff 26 24 27 25 static inline void __iomem *__io(unsigned long addr)
+1
sound/arm/aaci.c
··· 20 20 21 21 #include <asm/io.h> 22 22 #include <asm/irq.h> 23 + #include <asm/sizes.h> 23 24 #include <asm/hardware/amba.h> 24 25 25 26 #include <sound/driver.h>