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

Commit 1716bcf3 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John W. Linville
Browse files

bcma: add support for chipcommon B core 



This core is used on BCM4708 to configure the PCIe and USB3 PHYs and it
contains the addresses to the Device Management unit. This will be used
by the PCIe driver first.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 23a2f39c

drivers/bcma/Makefile

+1 −0
Original line number Original line Diff line number Diff line 
bcma-y					+= main.o scan.o core.o sprom.o

bcma-y					+= main.o scan.o core.o sprom.o

bcma-y					+= driver_chipcommon.o driver_chipcommon_pmu.o

bcma-y					+= driver_chipcommon.o driver_chipcommon_pmu.o

bcma-y					+= driver_chipcommon_b.o

bcma-$(CONFIG_BCMA_SFLASH)		+= driver_chipcommon_sflash.o

bcma-$(CONFIG_BCMA_SFLASH)		+= driver_chipcommon_sflash.o

bcma-$(CONFIG_BCMA_NFLASH)		+= driver_chipcommon_nflash.o

bcma-$(CONFIG_BCMA_NFLASH)		+= driver_chipcommon_nflash.o

bcma-y					+= driver_pci.o

bcma-y					+= driver_pci.o

drivers/bcma/bcma_private.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -50,6 +50,10 @@ void bcma_chipco_serial_init(struct bcma_drv_cc *cc); 
extern struct platform_device bcma_pflash_dev;

extern struct platform_device bcma_pflash_dev;

#endif /* CONFIG_BCMA_DRIVER_MIPS */

#endif /* CONFIG_BCMA_DRIVER_MIPS */





/* driver_chipcommon_b.c */

int bcma_core_chipcommon_b_init(struct bcma_drv_cc_b *ccb);

void bcma_core_chipcommon_b_free(struct bcma_drv_cc_b *ccb);



/* driver_chipcommon_pmu.c */

/* driver_chipcommon_pmu.c */

u32 bcma_pmu_get_alp_clock(struct bcma_drv_cc *cc);

u32 bcma_pmu_get_alp_clock(struct bcma_drv_cc *cc);

u32 bcma_pmu_get_cpu_clock(struct bcma_drv_cc *cc);

u32 bcma_pmu_get_cpu_clock(struct bcma_drv_cc *cc);

drivers/bcma/driver_chipcommon_b.c

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

 * Broadcom specific AMBA

 * ChipCommon B Unit driver

 *

 * Copyright 2014, Hauke Mehrtens <hauke@hauke-m.de>

 *

 * Licensed under the GNU/GPL. See COPYING for details.

 */



#include "bcma_private.h"

#include <linux/export.h>

#include <linux/bcma/bcma.h>



static bool bcma_wait_reg(struct bcma_bus *bus, void __iomem *addr, u32 mask,

			  u32 value, int timeout)

{

	unsigned long deadline = jiffies + timeout;

	u32 val;



	do {

		val = readl(addr);

		if ((val & mask) == value)

			return true;

		cpu_relax();

		udelay(10);

	} while (!time_after_eq(jiffies, deadline));



	bcma_err(bus, "Timeout waiting for register %p\n", addr);



	return false;

}



void bcma_chipco_b_mii_write(struct bcma_drv_cc_b *ccb, u32 offset, u32 value)

{

	struct bcma_bus *bus = ccb->core->bus;



	writel(offset, ccb->mii + 0x00);

	bcma_wait_reg(bus, ccb->mii + 0x00, 0x0100, 0x0000, 100);

	writel(value, ccb->mii + 0x04);

	bcma_wait_reg(bus, ccb->mii + 0x00, 0x0100, 0x0000, 100);

}

EXPORT_SYMBOL_GPL(bcma_chipco_b_mii_write);



int bcma_core_chipcommon_b_init(struct bcma_drv_cc_b *ccb)

{

	if (ccb->setup_done)

		return 0;



	ccb->setup_done = 1;

	ccb->mii = ioremap_nocache(ccb->core->addr_s[1], BCMA_CORE_SIZE);

	if (!ccb->mii)

		return -ENOMEM;



	return 0;

}



void bcma_core_chipcommon_b_free(struct bcma_drv_cc_b *ccb)

{

	if (ccb->mii)

		iounmap(ccb->mii);

}

drivers/bcma/main.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -173,6 +173,7 @@ static int bcma_register_devices(struct bcma_bus *bus) 
		switch (core->id.id) {

		switch (core->id.id) {

		case BCMA_CORE_4706_CHIPCOMMON:

		case BCMA_CORE_4706_CHIPCOMMON:

		case BCMA_CORE_CHIPCOMMON:

		case BCMA_CORE_CHIPCOMMON:

		case BCMA_CORE_NS_CHIPCOMMON_B:

		case BCMA_CORE_PCI:

		case BCMA_CORE_PCI:

		case BCMA_CORE_PCIE:

		case BCMA_CORE_PCIE:

		case BCMA_CORE_PCIE2:

		case BCMA_CORE_PCIE2:
@@ -287,6 +288,13 @@ int bcma_bus_register(struct bcma_bus *bus) 
		bcma_core_chipcommon_init(&bus->drv_cc);

		bcma_core_chipcommon_init(&bus->drv_cc);

	}

	}





	/* Init CC core */

	core = bcma_find_core(bus, BCMA_CORE_NS_CHIPCOMMON_B);

	if (core) {

		bus->drv_cc_b.core = core;

		bcma_core_chipcommon_b_init(&bus->drv_cc_b);

	}



	/* Init MIPS core */

	/* Init MIPS core */

	core = bcma_find_core(bus, BCMA_CORE_MIPS_74K);

	core = bcma_find_core(bus, BCMA_CORE_MIPS_74K);

	if (core) {

	if (core) {
@@ -341,6 +349,8 @@ void bcma_bus_unregister(struct bcma_bus *bus) 
	else if (err)

	else if (err)

		bcma_err(bus, "Can not unregister GPIO driver: %i\n", err);

		bcma_err(bus, "Can not unregister GPIO driver: %i\n", err);





	bcma_core_chipcommon_b_free(&bus->drv_cc_b);



	cores[0] = bcma_find_core(bus, BCMA_CORE_MIPS_74K);

	cores[0] = bcma_find_core(bus, BCMA_CORE_MIPS_74K);

	cores[1] = bcma_find_core(bus, BCMA_CORE_PCIE);

	cores[1] = bcma_find_core(bus, BCMA_CORE_PCIE);

	cores[2] = bcma_find_core(bus, BCMA_CORE_4706_MAC_GBIT_COMMON);

	cores[2] = bcma_find_core(bus, BCMA_CORE_4706_MAC_GBIT_COMMON);

drivers/bcma/scan.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -314,6 +314,7 @@ static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr, 
		/* Some specific cores don't need wrappers */

		/* Some specific cores don't need wrappers */

		switch (core->id.id) {

		switch (core->id.id) {

		case BCMA_CORE_4706_MAC_GBIT_COMMON:

		case BCMA_CORE_4706_MAC_GBIT_COMMON:

		case BCMA_CORE_NS_CHIPCOMMON_B:

		/* Not used yet: case BCMA_CORE_OOB_ROUTER: */

		/* Not used yet: case BCMA_CORE_OOB_ROUTER: */

			break;

			break;

		default:

		default: