projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next'
[platform/kernel/u-boot.git]
/
include
/
asm-avr32
/
io.h
diff --git
a/include/asm-avr32/io.h
b/include/asm-avr32/io.h
index
ba14674
..
50967ac
100644
(file)
--- a/
include/asm-avr32/io.h
+++ b/
include/asm-avr32/io.h
@@
-22,6
+22,8
@@
#ifndef __ASM_AVR32_IO_H
#define __ASM_AVR32_IO_H
#ifndef __ASM_AVR32_IO_H
#define __ASM_AVR32_IO_H
+#include <asm/types.h>
+
#ifdef __KERNEL__
/*
#ifdef __KERNEL__
/*
@@
-74,12
+76,12
@@
extern void __readwrite_bug(const char *fn);
#include <asm/addrspace.h>
/* virt_to_phys will only work when address is in P1 or P2 */
#include <asm/addrspace.h>
/* virt_to_phys will only work when address is in P1 or P2 */
-static
__inline__ unsigned long
virt_to_phys(volatile void *address)
+static
inline phys_addr_t
virt_to_phys(volatile void *address)
{
return PHYSADDR(address);
}
{
return PHYSADDR(address);
}
-static
__inline__ void * phys_to_virt(unsigned long
address)
+static
inline void *phys_to_virt(phys_addr_t
address)
{
return (void *)P1SEGADDR(address);
}
{
return (void *)P1SEGADDR(address);
}
@@
-101,8
+103,6
@@
static inline void sync(void)
* This implementation works for memory below 512MiB (flash, etc.) as
* well as above 3.5GiB (internal peripherals.)
*/
* This implementation works for memory below 512MiB (flash, etc.) as
* well as above 3.5GiB (internal peripherals.)
*/
-typedef unsigned long phys_addr_t;
-
#define MAP_NOCACHE (0)
#define MAP_WRCOMBINE (1 << 7)
#define MAP_WRBACK (MAP_WRCOMBINE | (1 << 9))
#define MAP_NOCACHE (0)
#define MAP_WRCOMBINE (1 << 7)
#define MAP_WRBACK (MAP_WRCOMBINE | (1 << 9))