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

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

MIPS: BCM47XX: provide sprom to bcma bus 



On SoCs the sprom is often stored in nvram in the flashchip. This patch
registers a sprom fallback callback handler in bcma and provides the
sprom needed for this device.

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

arch/mips/bcm47xx/setup.c

+35 −4
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *  Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>

 *  Copyright (C) 2006 Michael Buesch <m@bues.ch>

 *  Copyright (C) 2010 Waldemar Brodkorb <wbx@openadk.org>

 *  Copyright (C) 2010-2011 Hauke Mehrtens <hauke@hauke-m.de>

 *  Copyright (C) 2010-2012 Hauke Mehrtens <hauke@hauke-m.de>

 *

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

 *  under  the terms of  the GNU General  Public License as published by the
@@ -85,7 +85,7 @@ static void bcm47xx_machine_halt(void) 
}



#ifdef CONFIG_BCM47XX_SSB

static int bcm47xx_get_sprom(struct ssb_bus *bus, struct ssb_sprom *out)

static int bcm47xx_get_sprom_ssb(struct ssb_bus *bus, struct ssb_sprom *out)

{

	char prefix[10];
@@ -132,7 +132,7 @@ static void __init bcm47xx_register_ssb(void) 
	char buf[100];

	struct ssb_mipscore *mcore;



	err = ssb_arch_register_fallback_sprom(&bcm47xx_get_sprom);

	err = ssb_arch_register_fallback_sprom(&bcm47xx_get_sprom_ssb);

	if (err)

		printk(KERN_WARNING "bcm47xx: someone else already registered"

			" a ssb SPROM callback handler (err %d)\n", err);
@@ -159,10 +159,41 @@ static void __init bcm47xx_register_ssb(void) 
#endif



#ifdef CONFIG_BCM47XX_BCMA

static int bcm47xx_get_sprom_bcma(struct bcma_bus *bus, struct ssb_sprom *out)

{

	char prefix[10];

	struct bcma_device *core;



	switch (bus->hosttype) {

	case BCMA_HOSTTYPE_PCI:

		snprintf(prefix, sizeof(prefix), "pci/%u/%u/",

			 bus->host_pci->bus->number + 1,

			 PCI_SLOT(bus->host_pci->devfn));

		bcm47xx_fill_sprom(out, prefix);

		return 0;

	case BCMA_HOSTTYPE_SOC:

		bcm47xx_fill_sprom_ethernet(out, NULL);

		core = bcma_find_core(bus, BCMA_CORE_80211);

		if (core) {

			snprintf(prefix, sizeof(prefix), "sb/%u/",

				 core->core_index);

			bcm47xx_fill_sprom(out, prefix);

		}

		return 0;

	default:

		pr_warn("bcm47xx: unable to fill SPROM for given bustype.\n");

		return -EINVAL;

	}

}



static void __init bcm47xx_register_bcma(void)

{

	int err;



	err = bcma_arch_register_fallback_sprom(&bcm47xx_get_sprom_bcma);

	if (err)

		pr_warn("bcm47xx: someone else already registered a bcma SPROM callback handler (err %d)\n", err);



	err = bcma_host_soc_register(&bcm47xx_bus.bcma);

	if (err)

		panic("Failed to initialize BCMA bus (err %d)", err);