Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3941/1: [Jornada7xx] - Addition to MAINTAINERS [ARM] 3942/1: ARM: comment: consistent_sync should not be called directly [ARM] ebsa110: fix warnings generated by asm/arch/io.h [ARM] 3933/1: Source drivers/ata/Kconfig
This commit is contained in:
commit
5261d661b4
6 changed files with 30 additions and 9 deletions
|
@ -353,6 +353,12 @@ P: Richard Purdie
|
||||||
M: rpurdie@rpsys.net
|
M: rpurdie@rpsys.net
|
||||||
S: Maintained
|
S: Maintained
|
||||||
|
|
||||||
|
ARM/HP JORNADA 7XX MACHINE SUPPORT
|
||||||
|
P: Kristoffer Ericson
|
||||||
|
M: kristoffer_e1@hotmail.com
|
||||||
|
W: www.jlime.com
|
||||||
|
S: Maintained
|
||||||
|
|
||||||
ARM/TOSA MACHINE SUPPORT
|
ARM/TOSA MACHINE SUPPORT
|
||||||
P: Dirk Opfer
|
P: Dirk Opfer
|
||||||
M: dirk@opfer-online.de
|
M: dirk@opfer-online.de
|
||||||
|
|
|
@ -879,6 +879,8 @@ endif
|
||||||
|
|
||||||
source "drivers/scsi/Kconfig"
|
source "drivers/scsi/Kconfig"
|
||||||
|
|
||||||
|
source "drivers/ata/Kconfig"
|
||||||
|
|
||||||
source "drivers/md/Kconfig"
|
source "drivers/md/Kconfig"
|
||||||
|
|
||||||
source "drivers/message/fusion/Kconfig"
|
source "drivers/message/fusion/Kconfig"
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/page.h>
|
#include <asm/page.h>
|
||||||
|
|
||||||
static void __iomem *__isamem_convert_addr(void __iomem *addr)
|
static void __iomem *__isamem_convert_addr(const volatile void __iomem *addr)
|
||||||
{
|
{
|
||||||
u32 ret, a = (u32 __force) addr;
|
u32 ret, a = (u32 __force) addr;
|
||||||
|
|
||||||
|
@ -63,7 +63,7 @@ static void __iomem *__isamem_convert_addr(void __iomem *addr)
|
||||||
/*
|
/*
|
||||||
* read[bwl] and write[bwl]
|
* read[bwl] and write[bwl]
|
||||||
*/
|
*/
|
||||||
u8 __readb(void __iomem *addr)
|
u8 __readb(const volatile void __iomem *addr)
|
||||||
{
|
{
|
||||||
void __iomem *a = __isamem_convert_addr(addr);
|
void __iomem *a = __isamem_convert_addr(addr);
|
||||||
u32 ret;
|
u32 ret;
|
||||||
|
@ -75,7 +75,7 @@ u8 __readb(void __iomem *addr)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
u16 __readw(void __iomem *addr)
|
u16 __readw(const volatile void __iomem *addr)
|
||||||
{
|
{
|
||||||
void __iomem *a = __isamem_convert_addr(addr);
|
void __iomem *a = __isamem_convert_addr(addr);
|
||||||
|
|
||||||
|
@ -85,7 +85,7 @@ u16 __readw(void __iomem *addr)
|
||||||
return __raw_readw(a);
|
return __raw_readw(a);
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 __readl(void __iomem *addr)
|
u32 __readl(const volatile void __iomem *addr)
|
||||||
{
|
{
|
||||||
void __iomem *a = __isamem_convert_addr(addr);
|
void __iomem *a = __isamem_convert_addr(addr);
|
||||||
u32 ret;
|
u32 ret;
|
||||||
|
|
|
@ -476,6 +476,9 @@ core_initcall(consistent_init);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Make an area consistent for devices.
|
* Make an area consistent for devices.
|
||||||
|
* Note: Drivers should NOT use this function directly, as it will break
|
||||||
|
* platforms with CONFIG_DMABOUNCE.
|
||||||
|
* Use the driver DMA support - see dma-mapping.h (dma_sync_*)
|
||||||
*/
|
*/
|
||||||
void consistent_sync(void *vaddr, size_t size, int direction)
|
void consistent_sync(void *vaddr, size_t size, int direction)
|
||||||
{
|
{
|
||||||
|
|
|
@ -27,9 +27,9 @@ void __outw(u16 val, unsigned int port);
|
||||||
u32 __inl(unsigned int port);
|
u32 __inl(unsigned int port);
|
||||||
void __outl(u32 val, unsigned int port);
|
void __outl(u32 val, unsigned int port);
|
||||||
|
|
||||||
u8 __readb(void __iomem *addr);
|
u8 __readb(const volatile void __iomem *addr);
|
||||||
u16 __readw(void __iomem *addr);
|
u16 __readw(const volatile void __iomem *addr);
|
||||||
u32 __readl(void __iomem *addr);
|
u32 __readl(const volatile void __iomem *addr);
|
||||||
|
|
||||||
void __writeb(u8 val, void __iomem *addr);
|
void __writeb(u8 val, void __iomem *addr);
|
||||||
void __writew(u16 val, void __iomem *addr);
|
void __writew(u16 val, void __iomem *addr);
|
||||||
|
@ -64,7 +64,13 @@ void __writel(u32 val, void __iomem *addr);
|
||||||
#define writew(v,b) __writew(v,b)
|
#define writew(v,b) __writew(v,b)
|
||||||
#define writel(v,b) __writel(v,b)
|
#define writel(v,b) __writel(v,b)
|
||||||
|
|
||||||
#define __arch_ioremap(cookie,sz,c) ((void __iomem *)(cookie))
|
static inline void __iomem *__arch_ioremap(unsigned long cookie, size_t size,
|
||||||
|
unsigned int flags)
|
||||||
|
{
|
||||||
|
return (void __iomem *)cookie;
|
||||||
|
}
|
||||||
|
|
||||||
|
#define __arch_ioremap __arch_ioremap
|
||||||
#define __arch_iounmap(cookie) do { } while (0)
|
#define __arch_iounmap(cookie) do { } while (0)
|
||||||
|
|
||||||
extern void insb(unsigned int port, void *buf, int sz);
|
extern void insb(unsigned int port, void *buf, int sz);
|
||||||
|
|
|
@ -12,6 +12,10 @@
|
||||||
* uncached, unwrite-buffered mapped memory space for use with DMA
|
* uncached, unwrite-buffered mapped memory space for use with DMA
|
||||||
* devices. This is the "generic" version. The PCI specific version
|
* devices. This is the "generic" version. The PCI specific version
|
||||||
* is in pci.h
|
* is in pci.h
|
||||||
|
*
|
||||||
|
* Note: Drivers should NOT use this function directly, as it will break
|
||||||
|
* platforms with CONFIG_DMABOUNCE.
|
||||||
|
* Use the driver DMA support - see dma-mapping.h (dma_sync_*)
|
||||||
*/
|
*/
|
||||||
extern void consistent_sync(void *kaddr, size_t size, int rw);
|
extern void consistent_sync(void *kaddr, size_t size, int rw);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue