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

Commit 9788ba75 authored by Michael Buesch's avatar Michael Buesch Committed by John W. Linville
Browse files

ssb-pcmcia: IRQ and DMA related fixes 



Here come some IRQ and DMA related fixes for the ssb PCMCIA-host code.
Not much to say, actually. I think the patch explains itself.

Signed-off-by: default avatarMichael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 24736701

drivers/ssb/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1064,9 +1064,9 @@ u32 ssb_dma_translation(struct ssb_device *dev) 
{

	switch (dev->bus->bustype) {

	case SSB_BUSTYPE_SSB:

	case SSB_BUSTYPE_PCMCIA:

		return 0;

	case SSB_BUSTYPE_PCI:

	case SSB_BUSTYPE_PCMCIA:

		return SSB_PCI_DMA;

	}

	return 0;

drivers/ssb/pcmcia.c

+22 −14
Original line number Diff line number Diff line
@@ -28,11 +28,6 @@ 




/* PCMCIA configuration registers */

#define SSB_PCMCIA_CORECTL		0x00

#define  SSB_PCMCIA_CORECTL_RESET	0x80 /* Core reset */

#define  SSB_PCMCIA_CORECTL_IRQEN	0x04 /* IRQ enable */

#define  SSB_PCMCIA_CORECTL_FUNCEN	0x01 /* Function enable */

#define SSB_PCMCIA_CORECTL2		0x80

#define SSB_PCMCIA_ADDRESS0		0x2E

#define SSB_PCMCIA_ADDRESS1		0x30

#define SSB_PCMCIA_ADDRESS2		0x32
@@ -671,6 +666,24 @@ static DEVICE_ATTR(ssb_sprom, 0600, 
		   ssb_pcmcia_attr_sprom_show,

		   ssb_pcmcia_attr_sprom_store);



static int ssb_pcmcia_cor_setup(struct ssb_bus *bus, u8 cor)

{

	u8 val;

	int err;



	err = ssb_pcmcia_cfg_read(bus, cor, &val);

	if (err)

		return err;

	val &= ~COR_SOFT_RESET;

	val |= COR_FUNC_ENA | COR_IREQ_ENA | COR_LEVEL_REQ;

	err = ssb_pcmcia_cfg_write(bus, cor, val);

	if (err)

		return err;

	msleep(40);



	return 0;

}



void ssb_pcmcia_exit(struct ssb_bus *bus)

{

	if (bus->bustype != SSB_BUSTYPE_PCMCIA)
@@ -681,7 +694,6 @@ void ssb_pcmcia_exit(struct ssb_bus *bus) 


int ssb_pcmcia_init(struct ssb_bus *bus)

{

	u8 val, offset;

	int err;



	if (bus->bustype != SSB_BUSTYPE_PCMCIA)
@@ -691,16 +703,12 @@ int ssb_pcmcia_init(struct ssb_bus *bus) 
	 * bus->mapped_pcmcia_seg with hardware state. */

	ssb_pcmcia_switch_segment(bus, 0);



	/* Init IRQ routing */

	if (bus->chip_id == 0x4306)

		offset = SSB_PCMCIA_CORECTL;

	else

		offset = SSB_PCMCIA_CORECTL2;

	err = ssb_pcmcia_cfg_read(bus, offset, &val);

	/* Init the COR register. */

	err = ssb_pcmcia_cor_setup(bus, CISREG_COR);

	if (err)

		goto error;

	val |= SSB_PCMCIA_CORECTL_IRQEN | SSB_PCMCIA_CORECTL_FUNCEN;

	err = ssb_pcmcia_cfg_write(bus, offset, val);

	/* Some cards also need this register to get poked. */

	err = ssb_pcmcia_cor_setup(bus, CISREG_COR + 0x80);

	if (err)

		goto error;