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

Commit c04dc9a6 authored by Rob Herring's avatar Rob Herring
Browse files

ARM: shark: use fixed PCI i/o mapping 



Convert shark to use the fixed i/o mapping and remove io.h.

This shrinks the mapping from 256MB to 1MB, but nothing is using that much
space AFAICT.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 29d39604

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -869,7 +869,6 @@ config ARCH_SHARK 
	select PCI

	select ARCH_USES_GETTIMEOFFSET

	select NEED_MACH_MEMORY_H

	select NEED_MACH_IO_H

	help

	  Support for the StrongARM based Digital DNARD machine, also known

	  as "Shark" (<http://www.shark-linux.de/shark.html>).

arch/arm/mach-shark/core.c

+0 −18
Original line number Diff line number Diff line
@@ -21,9 +21,6 @@ 
#include <asm/mach/arch.h>

#include <asm/mach/time.h>



#define IO_BASE                 0xe0000000

#define IO_SIZE                 0x08000000

#define IO_START                0x40000000

#define ROMCARD_SIZE            0x08000000

#define ROMCARD_START           0x10000000
@@ -104,20 +101,6 @@ arch_initcall(shark_init); 


extern void shark_init_irq(void);



static struct map_desc shark_io_desc[] __initdata = {

	{

		.virtual	= IO_BASE,

		.pfn		= __phys_to_pfn(IO_START),

		.length		= IO_SIZE,

		.type		= MT_DEVICE

	}

};



static void __init shark_map_io(void)

{

	iotable_init(shark_io_desc, ARRAY_SIZE(shark_io_desc));

}



#define IRQ_TIMER 0

#define HZ_TIME ((1193180 + HZ/2) / HZ)
@@ -158,7 +141,6 @@ static void shark_init_early(void) 
MACHINE_START(SHARK, "Shark")

	/* Maintainer: Alexander Schulz */

	.atag_offset	= 0x3000,

	.map_io		= shark_map_io,

	.init_early	= shark_init_early,

	.init_irq	= shark_init_irq,

	.timer		= &shark_timer,

arch/arm/mach-shark/include/mach/debug-macro.S

+4 −3
Original line number Diff line number Diff line
@@ -12,9 +12,10 @@ 
*/



		.macro	addruart, rp, rv, tmp

		mov	\rp, #0xe0000000

		orr	\rp, \rp, #0x000003f8

		mov	\rv, \rp

		mov	\rp, #0x3f8

		orr	\rv, \rp, #0xfe000000

		orr	\rv, \rv, #0x00e00000

		orr	\rp, \rp, #0x40000000

		.endm



		.macro	senduart,rd,rx

arch/arm/mach-shark/include/mach/entry-macro.S

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ 
 * warranty of any kind, whether express or implied.

 */

		.macro  get_irqnr_preamble, base, tmp

		mov	\base, #0xe0000000

		mov	\base, #0xfe000000

		orr	\base, \base, #0x00e00000

		.endm



		.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp

arch/arm/mach-shark/include/mach/io.h

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-shark/include/mach/io.h

 *

 * by Alexander Schulz

 *

 * derived from:

 * arch/arm/mach-ebsa110/include/mach/io.h

 * Copyright (C) 1997,1998 Russell King

 */



#ifndef __ASM_ARM_ARCH_IO_H

#define __ASM_ARM_ARCH_IO_H



#define IO_SPACE_LIMIT 0xffffffff



#define __io(a)                 ((void __iomem *)(0xe0000000 + (a)))



#endif