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

Commit 6bf2e546 authored by Nathan Hintz's avatar Nathan Hintz Committed by John W. Linville
Browse files

bcma: fix bcm4716/bcm4748 i2s irqflag 



The default irqflag assignment for the I2S core on some Broadcom
4716/4748 devices is invalid and needs to be corrected (from the
Broadcom SDK).

Signed-off-by: default avatarNathan Hintz <nlhintz@hotmail.com>
Acked-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e2d4a24e

drivers/bcma/driver_mips.c

+28 −0
Original line number Diff line number Diff line
@@ -256,6 +256,32 @@ void bcma_core_mips_early_init(struct bcma_drv_mips *mcore) 
	mcore->early_setup_done = true;

}



static void bcma_fix_i2s_irqflag(struct bcma_bus *bus)

{

	struct bcma_device *cpu, *pcie, *i2s;



	/* Fixup the interrupts in 4716/4748 for i2s core (2010 Broadcom SDK)

	 * (IRQ flags > 7 are ignored when setting the interrupt masks)

	 */

	if (bus->chipinfo.id != BCMA_CHIP_ID_BCM4716 &&

	    bus->chipinfo.id != BCMA_CHIP_ID_BCM4748)

		return;



	cpu = bcma_find_core(bus, BCMA_CORE_MIPS_74K);

	pcie = bcma_find_core(bus, BCMA_CORE_PCIE);

	i2s = bcma_find_core(bus, BCMA_CORE_I2S);

	if (cpu && pcie && i2s &&

	    bcma_aread32(cpu, BCMA_MIPS_OOBSELINA74) == 0x08060504 &&

	    bcma_aread32(pcie, BCMA_MIPS_OOBSELINA74) == 0x08060504 &&

	    bcma_aread32(i2s, BCMA_MIPS_OOBSELOUTA30) == 0x88) {

		bcma_awrite32(cpu, BCMA_MIPS_OOBSELINA74, 0x07060504);

		bcma_awrite32(pcie, BCMA_MIPS_OOBSELINA74, 0x07060504);

		bcma_awrite32(i2s, BCMA_MIPS_OOBSELOUTA30, 0x87);

		bcma_debug(bus,

			   "Moved i2s interrupt to oob line 7 instead of 8\n");

	}

}



void bcma_core_mips_init(struct bcma_drv_mips *mcore)

{

	struct bcma_bus *bus;
@@ -269,6 +295,8 @@ void bcma_core_mips_init(struct bcma_drv_mips *mcore) 


	bcma_core_mips_early_init(mcore);



	bcma_fix_i2s_irqflag(bus);



	switch (bus->chipinfo.id) {

	case BCMA_CHIP_ID_BCM4716:

	case BCMA_CHIP_ID_BCM4748:

include/linux/bcma/bcma_driver_mips.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#define BCMA_MIPS_MIPS74K_GPIOEN	0x0048

#define BCMA_MIPS_MIPS74K_CLKCTLST	0x01E0



#define BCMA_MIPS_OOBSELINA74		0x004

#define BCMA_MIPS_OOBSELOUTA30		0x100



struct bcma_device;