Commit d6460827 authored by Pete Popov's avatar Pete Popov Committed by Ralf Baechle
Browse files

Updated pcmcia driver with pb1200 and db1200 support. 


Updated db1200_defconfig so pcmcia is enabled by default.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent efe29c0f

arch/mips/au1000/common/platform.c

+0 −2
Original line number Diff line number Diff line
@@ -207,8 +207,6 @@ static struct platform_device au1200_ide0_device = { 
	.resource	= au1200_ide0_resources,

};



#endif



static struct platform_device au1x00_pcmcia_device = {

	.name 		= "au1x00-pcmcia",

	.id 		= 0,

drivers/pcmcia/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -42,9 +42,11 @@ pxa2xx_core-y += soc_common.o pxa2xx_base.o 
au1x00_ss-y					+= au1000_generic.o

au1x00_ss-$(CONFIG_MIPS_PB1000)			+= au1000_pb1x00.o

au1x00_ss-$(CONFIG_MIPS_PB1100)			+= au1000_pb1x00.o

au1x00_ss-$(CONFIG_MIPS_PB1200)			+= au1000_db1x00.o

au1x00_ss-$(CONFIG_MIPS_PB1500)			+= au1000_pb1x00.o

au1x00_ss-$(CONFIG_MIPS_DB1000)			+= au1000_db1x00.o

au1x00_ss-$(CONFIG_MIPS_DB1100)			+= au1000_db1x00.o

au1x00_ss-$(CONFIG_MIPS_DB1200)                 += au1000_db1x00.o

au1x00_ss-$(CONFIG_MIPS_DB1500)			+= au1000_db1x00.o

au1x00_ss-$(CONFIG_MIPS_DB1550)			+= au1000_db1x00.o

au1x00_ss-$(CONFIG_MIPS_XXS1500)               += au1000_xxs1500.o

drivers/pcmcia/au1000_db1x00.c

+19 −2
Original line number Diff line number Diff line
@@ -40,7 +40,15 @@ 
#include <asm/irq.h>

#include <asm/signal.h>

#include <asm/mach-au1x00/au1000.h>



#if defined(CONFIG_MIPS_DB1200)

	#include <db1200.h>

#elif defined(CONFIG_MIPS_PB1200)

	#include <pb1200.h>

#else

	#include <asm/mach-db1x00/db1x00.h>

	static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR;

#endif



#include "au1000_generic.h"
@@ -50,7 +58,6 @@ 
#define debug(x,args...)

#endif



static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR;



struct au1000_pcmcia_socket au1000_pcmcia_socket[PCMCIA_NUM_SOCKS];

extern int au1x00_pcmcia_socket_probe(struct device *, struct pcmcia_low_level *, int, int);
@@ -59,6 +66,8 @@ static int db1x00_pcmcia_hw_init(struct au1000_pcmcia_socket *skt) 
{

#ifdef CONFIG_MIPS_DB1550

	skt->irq = skt->nr ? AU1000_GPIO_5 : AU1000_GPIO_3;

#elif defined(CONFIG_MIPS_DB1200) || defined(CONFIG_MIPS_PB1200)

	skt->irq = skt->nr ? BOARD_PC1_INT : BOARD_PC0_INT;

#else

	skt->irq = skt->nr ? AU1000_GPIO_5 : AU1000_GPIO_2;

#endif
@@ -85,11 +94,19 @@ db1x00_pcmcia_socket_state(struct au1000_pcmcia_socket *skt, struct pcmcia_state 
	switch (skt->nr) {

	case 0:

		vs = bcsr->status & 0x3;

#if defined(CONFIG_MIPS_DB1200) || defined(CONFIG_MIPS_PB1200)

		inserted = BOARD_CARD_INSERTED(0);

#else

		inserted = !(bcsr->status & (1<<4));

#endif

		break;

	case 1:

		vs = (bcsr->status & 0xC)>>2;

#if defined(CONFIG_MIPS_DB1200) || defined(CONFIG_MIPS_PB1200)

		inserted = BOARD_CARD_INSERTED(1);

#else

		inserted = !(bcsr->status & (1<<5));

#endif

		break;

	default:/* should never happen */

		return;

drivers/pcmcia/au1000_generic.h

+2 −2
Original line number Diff line number Diff line
@@ -44,13 +44,13 @@ 
/* pcmcia socket 1 needs external glue logic so the memory map

 * differs from board to board.

 */

#if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_PB1100) || defined(CONFIG_MIPS_PB1500) || defined(CONFIG_MIPS_PB1550)

#if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_PB1100) || defined(CONFIG_MIPS_PB1500) || defined(CONFIG_MIPS_PB1550) || defined(CONFIG_MIPS_PB1200)

#define AU1X_SOCK1_IO        0xF08000000

#define AU1X_SOCK1_PHYS_ATTR 0xF48000000

#define AU1X_SOCK1_PHYS_MEM  0xF88000000

#define AU1X_SOCK1_PSEUDO_PHYS_ATTR 0xF4800000

#define AU1X_SOCK1_PSEUDO_PHYS_MEM  0xF8800000

#elif defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100) || defined(CONFIG_MIPS_DB1500) || defined(CONFIG_MIPS_DB1550)

#elif defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100) || defined(CONFIG_MIPS_DB1500) || defined(CONFIG_MIPS_DB1550) || defined(CONFIG_MIPS_DB1200)

#define AU1X_SOCK1_IO        0xF04000000

#define AU1X_SOCK1_PHYS_ATTR 0xF44000000

#define AU1X_SOCK1_PHYS_MEM  0xF84000000

include/asm-mips/mach-db1x00/db1200.h

+10 −0
Original line number Diff line number Diff line
@@ -206,6 +206,16 @@ static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR; 
#define DB1200_INT_END			(DB1200_INT_BEGIN + 15)



/* For drivers/pcmcia/au1000_db1x00.c */



/* PCMCIA Db1x00 specific defines */



#define PCMCIA_MAX_SOCK 1

#define PCMCIA_NUM_SOCKS (PCMCIA_MAX_SOCK+1)



/* VPP/VCC */

#define SET_VCC_VPP(VCC, VPP, SLOT)\

	((((VCC)<<2) | ((VPP)<<0)) << ((SLOT)*8))



#define BOARD_PC0_INT DB1200_PC0_INT

#define BOARD_PC1_INT DB1200_PC1_INT

#define BOARD_CARD_INSERTED(SOCKET) bcsr->sig_status & (1<<(8+(2*SOCKET)))