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

Commit b080ac8a authored by Marcelo Roberto Jimenez's avatar Marcelo Roberto Jimenez Committed by Russell King
Browse files

ARM: 6459/2: sa1100: Add nanoEngine PCI support. 



This patch adds nanoEngine's PCI support.

Signed-off-by: default avatarMarcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent fa87672a

arch/arm/Kconfig

+7 −1
Original line number Diff line number Diff line
@@ -1164,7 +1164,7 @@ config ISA_DMA_API 
	bool



config PCI

	bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 || MACH_ARMCORE || ARCH_CNS3XXX

	bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 || MACH_ARMCORE || ARCH_CNS3XXX || SA1100_NANOENGINE

	help

	  Find out whether you have a PCI motherboard. PCI is the name of a

	  bus system, i.e. the way the CPU talks to the other stuff inside
@@ -1175,6 +1175,12 @@ config PCI_DOMAINS 
	bool

	depends on PCI



config PCI_NANOENGINE

	bool "BSE nanoEngine PCI support"

	depends on SA1100_NANOENGINE

	help

	  Enable PCI on the BSE nanoEngine board.



config PCI_SYSCALL

	def_bool PCI

arch/arm/mach-sa1100/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -121,6 +121,8 @@ config SA1100_LART 
config SA1100_NANOENGINE

	bool "nanoEngine"

	select CPU_FREQ_SA1110

	select PCI

	select PCI_NANOENGINE

	help

	  Say Y here if you are using the Bright Star Engineering nanoEngine.

	  See <http://www.brightstareng.com/arm/nanoeng.htm> for information

arch/arm/mach-sa1100/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ obj-$(CONFIG_SA1100_LART) += lart.o 
led-$(CONFIG_SA1100_LART)		+= leds-lart.o



obj-$(CONFIG_SA1100_NANOENGINE)		+= nanoengine.o

obj-$(CONFIG_PCI_NANOENGINE)		+= pci-nanoengine.o



obj-$(CONFIG_SA1100_PLEB)		+= pleb.o

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

+8 −0
Original line number Diff line number Diff line
@@ -76,4 +76,12 @@ static inline unsigned long get_clock_tick_rate(void) 
#include "SA-1101.h"

#endif



#if defined(CONFIG_ARCH_SA1100) && defined(CONFIG_PCI)

#define PCIBIOS_MIN_IO		0

#define PCIBIOS_MIN_MEM		0

#define pcibios_assign_all_busses()	1

#define HAVE_ARCH_PCI_SET_DMA_MASK	1

#endif





#endif  /* _ASM_ARCH_HARDWARE_H */

arch/arm/mach-sa1100/include/mach/nanoengine.h

+22 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
#ifndef __ASM_ARCH_NANOENGINE_H

#define __ASM_ARCH_NANOENGINE_H



#include <mach/irqs.h>



#define GPIO_PC_READY0	GPIO_GPIO(11) /* ready for socket 0 (active high)*/

#define GPIO_PC_READY1	GPIO_GPIO(12) /* ready for socket 1 (active high) */

#define GPIO_PC_CD0	GPIO_GPIO(13) /* detect for socket 0 (active low) */
@@ -21,10 +23,30 @@ 
#define GPIO_PC_RESET0	GPIO_GPIO(15) /* reset socket 0 */

#define GPIO_PC_RESET1	GPIO_GPIO(16) /* reset socket 1 */



#define NANOENGINE_IRQ_GPIO_PCI		IRQ_GPIO0

#define NANOENGINE_IRQ_GPIO_PC_READY0	IRQ_GPIO11

#define NANOENGINE_IRQ_GPIO_PC_READY1	IRQ_GPIO12

#define NANOENGINE_IRQ_GPIO_PC_CD0	IRQ_GPIO13

#define NANOENGINE_IRQ_GPIO_PC_CD1	IRQ_GPIO14



/*

 * nanoEngine Memory Map:

 *

 * 0000.0000 - 003F.0000 -   4 MB Flash

 * C000.0000 - C1FF.FFFF -  32 MB SDRAM

 * 1860.0000 - 186F.FFFF -   1 MB Internal PCI Memory Read/Write

 * 18A1.0000 - 18A1.FFFF -  64 KB Internal PCI Config Space

 * 4000.0000 - 47FF.FFFF - 128 MB External Bus I/O - Multiplexed Mode

 * 4800.0000 - 4FFF.FFFF - 128 MB External Bus I/O - Non-Multiplexed Mode

 *

 */



#define NANO_PCI_MEM_RW_PHYS		0x18600000

#define NANO_PCI_MEM_RW_VIRT		0xf1000000

#define NANO_PCI_MEM_RW_SIZE		SZ_1M

#define NANO_PCI_CONFIG_SPACE_PHYS	0x18A10000

#define NANO_PCI_CONFIG_SPACE_VIRT	0xf2000000

#define NANO_PCI_CONFIG_SPACE_SIZE	SZ_64K



#endif