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

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

ARM: 6458/1: pcmcia: Adds nanoEngine PCMCIA support. 

This patch adds nanoEngine PCMCIA support, with support for two sockets.

In order to have a fully functional pcmcia subsystem in a BSE
nanoEngine board you should carefully read this:

http://cambuca.ldhs.cetuc.puc-rio.br/nanoengine/



Acked-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
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 17b38ebb

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

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/*

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

 *

 * This file contains the hardware specific definitions for nanoEngine.

 * Only include this file from SA1100-specific files.

 *

 * Copyright (C) 2010 Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>

 *

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

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 */

#ifndef __ASM_ARCH_NANOENGINE_H

#define __ASM_ARCH_NANOENGINE_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) */

#define GPIO_PC_CD1	GPIO_GPIO(14) /* detect for socket 1 (active low) */

#define GPIO_PC_RESET0	GPIO_GPIO(15) /* reset socket 0 */

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



#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



#endif

arch/arm/mach-sa1100/nanoengine.c

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Bright Star Engineering's nanoEngine board init code.

 *

 * Copyright (C) 2009 Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>

 * Copyright (C) 2010 Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>

 *

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

 * it under the terms of the GNU General Public License version 2 as

drivers/pcmcia/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ sa1100_cs-$(CONFIG_SA1100_ASSABET) += sa1100_assabet.o 
sa1100_cs-$(CONFIG_SA1100_CERF)			+= sa1100_cerf.o

sa1100_cs-$(CONFIG_SA1100_COLLIE)		+= pxa2xx_sharpsl.o

sa1100_cs-$(CONFIG_SA1100_H3600)		+= sa1100_h3600.o

sa1100_cs-$(CONFIG_SA1100_NANOENGINE)		+= sa1100_nanoengine.o

sa1100_cs-$(CONFIG_SA1100_SHANNON)		+= sa1100_shannon.o

sa1100_cs-$(CONFIG_SA1100_SIMPAD)		+= sa1100_simpad.o

drivers/pcmcia/sa1100_generic.c

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) = { 
#if defined(CONFIG_SA1100_H3100) || defined(CONFIG_SA1100_H3600)

	pcmcia_h3600_init,

#endif

#ifdef CONFIG_SA1100_NANOENGINE

	pcmcia_nanoengine_init,

#endif

#ifdef CONFIG_SA1100_SHANNON

	pcmcia_shannon_init,

#endif

drivers/pcmcia/sa1100_generic.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ extern int pcmcia_freebird_init(struct device *); 
extern int pcmcia_gcplus_init(struct device *);

extern int pcmcia_graphicsmaster_init(struct device *);

extern int pcmcia_h3600_init(struct device *);

extern int pcmcia_nanoengine_init(struct device *);

extern int pcmcia_pangolin_init(struct device *);

extern int pcmcia_pfs168_init(struct device *);

extern int pcmcia_shannon_init(struct device *);