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

Commit 68ef6322 authored by Rob Herring's avatar Rob Herring
Browse files

ARM: integrator: use fixed PCI i/o mapping 



Move integrator PCI to fixed i/o mapping and remove io.h.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
parent d94c7a04

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -261,7 +261,6 @@ config ARCH_INTEGRATOR 
	select GENERIC_CLOCKEVENTS

	select PLAT_VERSATILE

	select PLAT_VERSATILE_FPGA_IRQ

	select NEED_MACH_IO_H

	select NEED_MACH_MEMORY_H

	select SPARSE_IRQ

	select MULTI_IRQ_HANDLER

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

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

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

 *

 *  Copyright (C) 1999 ARM Limited

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */

#ifndef __ASM_ARM_ARCH_IO_H

#define __ASM_ARM_ARCH_IO_H



/*

 * WARNING: this has to mirror definitions in platform.h

 */

#define PCI_MEMORY_VADDR        0xe8000000

#define PCI_CONFIG_VADDR        0xec000000

#define PCI_V3_VADDR            0xed000000

#define PCI_IO_VADDR            0xee000000



#define __io(a)			((void __iomem *)(PCI_IO_VADDR + (a)))



#endif

arch/arm/mach-integrator/include/mach/platform.h

+4 −0
Original line number Diff line number Diff line
@@ -324,6 +324,10 @@ 
 */

#define PHYS_PCI_V3_BASE                0x62000000



#define PCI_MEMORY_VADDR		0xe8000000

#define PCI_CONFIG_VADDR		0xec000000

#define PCI_V3_VADDR			0xed000000



/* ------------------------------------------------------------------------

 *  Integrator Interrupt Controllers

 * ------------------------------------------------------------------------

arch/arm/mach-integrator/integrator_ap.c

+3 −6
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include <asm/mach/arch.h>

#include <asm/mach/irq.h>

#include <asm/mach/map.h>

#include <asm/mach/pci.h>

#include <asm/mach/time.h>



#include <plat/fpga-irq.h>
@@ -72,7 +73,7 @@ 
 * e8000000	40000000	PCI memory		PHYS_PCI_MEM_BASE	(max 512M)

 * ec000000	61000000	PCI config space	PHYS_PCI_CONFIG_BASE	(max 16M)

 * ed000000	62000000	PCI V3 regs		PHYS_PCI_V3_BASE	(max 64k)

 * ee000000	60000000	PCI IO			PHYS_PCI_IO_BASE	(max 16M)

 * fee00000	60000000	PCI IO			PHYS_PCI_IO_BASE	(max 16M)

 * ef000000			Cache flush

 * f1000000	10000000	Core module registers

 * f1100000	11000000	System controller registers
@@ -146,11 +147,6 @@ static struct map_desc ap_io_desc[] __initdata = { 
		.pfn		= __phys_to_pfn(PHYS_PCI_V3_BASE),

		.length		= SZ_64K,

		.type		= MT_DEVICE

	}, {

		.virtual	= PCI_IO_VADDR,

		.pfn		= __phys_to_pfn(PHYS_PCI_IO_BASE),

		.length		= SZ_64K,

		.type		= MT_DEVICE

	}

};
@@ -158,6 +154,7 @@ static void __init ap_map_io(void) 
{

	iotable_init(ap_io_desc, ARRAY_SIZE(ap_io_desc));

	vga_base = PCI_MEMORY_VADDR;

	pci_map_io_early(__phys_to_pfn(PHYS_PCI_IO_BASE));

}



#define INTEGRATOR_SC_VALID_INT	0x003fffff

arch/arm/mach-integrator/pci_v3.c

+0 −4
Original line number Diff line number Diff line
@@ -374,12 +374,9 @@ static int __init pci_v3_setup_resources(struct pci_sys_data *sys) 
	}



	/*

	 * the IO resource for this bus

	 * the mem resource for this bus

	 * the prefetch mem resource for this bus

	 */

	pci_add_resource_offset(&sys->resources,

				&ioport_resource, sys->io_offset);

	pci_add_resource_offset(&sys->resources, &non_mem, sys->mem_offset);

	pci_add_resource_offset(&sys->resources, &pre_mem, sys->mem_offset);
@@ -498,7 +495,6 @@ void __init pci_v3_preinit(void) 
	unsigned int temp;

	int ret;



	pcibios_min_io = 0x6000;

	pcibios_min_mem = 0x00100000;



	/*