Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e4cdb83 authored by Russell King's avatar Russell King
Browse files

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



Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 06cf0b54

arch/arm/kernel/ecard.c

+1 −1
Original line number Diff line number Diff line
@@ -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));



	src_pgd = pgd_offset(mm, EASI_BASE);

	src_pgd = pgd_offset(mm, (unsigned long)EASI_BASE);

	dst_pgd = pgd_offset(mm, EASI_START);



	memcpy(dst_pgd, src_pgd, sizeof(pgd_t) * (EASI_SIZE / PGDIR_SIZE));

arch/arm/mach-rpc/include/mach/hardware.h

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 


#define EASI_SIZE		0x08000000	/* EASI I/O */

#define EASI_START		0x08000000

#define EASI_BASE		0xe5000000

#define EASI_BASE		IOMEM(0xe5000000)



#define IO_START		0x03000000	/* I/O */

#define IO_SIZE			0x01000000
@@ -51,7 +51,7 @@ 
/*

 * IO Addresses

 */

#define ECARD_EASI_BASE		(IO_BASE + 0x05000000)

#define ECARD_EASI_BASE		(EASI_BASE)

#define VIDC_BASE		(IO_BASE + 0x00400000)

#define EXPMASK_BASE		(IO_BASE + 0x00360000)

#define ECARD_IOC4_BASE		(IO_BASE + 0x00270000)

arch/arm/mach-rpc/riscpc.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static struct map_desc rpc_io_desc[] __initdata = { 
		.length		= 	IO_SIZE	 ,

		.type		= MT_DEVICE

	}, {	/* EASI space	*/

		.virtual	= EASI_BASE,

		.virtual	= (unsigned long)EASI_BASE,

		.pfn		= __phys_to_pfn(EASI_START),

		.length		= EASI_SIZE,

		.type		= MT_DEVICE