lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: io: RiscPC: make EASI_BASE a void iomem pointer

Browse Source 
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
2011-07-07 11:40:52 +01:00
parent 06cf0b5468
commit 5e4cdb83ed
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/kernel/ecard.c
View File

@@ -237,7 +237,7 @@ static void ecard_init_pgtables(struct mm_struct *mm)
memcpy(dst_pgd, src_pgd, sizeof(pgd_t) * (IO_SIZE / PGDIR_SIZE)); memcpy(dst_pgd, src_pgd, sizeof(pgd_t) * (IO_SIZE / PGDIR_SIZE));
src_pgd = pgd_offset(mm, EASI_BASE); src_pgd = pgd_offset(mm, (unsigned long)EASI_BASE);
dst_pgd = pgd_offset(mm, EASI_START); dst_pgd = pgd_offset(mm, EASI_START);
memcpy(dst_pgd, src_pgd, sizeof(pgd_t) * (EASI_SIZE / PGDIR_SIZE)); memcpy(dst_pgd, src_pgd, sizeof(pgd_t) * (EASI_SIZE / PGDIR_SIZE));

4
arch/arm/mach-rpc/include/mach/hardware.h
View File

@@ -36,7 +36,7 @@
#define EASI_SIZE 0x08000000 /* EASI I/O */ #define EASI_SIZE 0x08000000 /* EASI I/O */
#define EASI_START 0x08000000 #define EASI_START 0x08000000
#define EASI_BASE 0xe5000000 #define EASI_BASE IOMEM(0xe5000000)
#define IO_START 0x03000000 /* I/O */ #define IO_START 0x03000000 /* I/O */
#define IO_SIZE 0x01000000 #define IO_SIZE 0x01000000
@@ -51,7 +51,7 @@
/* /*
* IO Addresses * IO Addresses
*/ */
#define ECARD_EASI_BASE (IO_BASE + 0x05000000) #define ECARD_EASI_BASE (EASI_BASE)
#define VIDC_BASE (IO_BASE + 0x00400000) #define VIDC_BASE (IO_BASE + 0x00400000)
#define EXPMASK_BASE (IO_BASE + 0x00360000) #define EXPMASK_BASE (IO_BASE + 0x00360000)
#define ECARD_IOC4_BASE (IO_BASE + 0x00270000) #define ECARD_IOC4_BASE (IO_BASE + 0x00270000)

2
arch/arm/mach-rpc/riscpc.c
View File

@@ -74,7 +74,7 @@ static struct map_desc rpc_io_desc[] __initdata = {
.length = IO_SIZE , .length = IO_SIZE ,
.type = MT_DEVICE .type = MT_DEVICE
}, { /* EASI space */ }, { /* EASI space */
.virtual = EASI_BASE, .virtual = (unsigned long)EASI_BASE,
.pfn = __phys_to_pfn(EASI_START), .pfn = __phys_to_pfn(EASI_START),
.length = EASI_SIZE, .length = EASI_SIZE,
.type = MT_DEVICE .type = MT_DEVICE