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

Commit d8cfb503 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Ralf Baechle
Browse files

MIPS: BCM47xx: Fetch board info directly in callback function 



This drops another symbol dependency between setup.c and sprom.c which
will allow us to make SPROM code a separated module (and share it with
ARM).
Patch tested on Linksys WRT300N V1.

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/11360/


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

arch/mips/bcm47xx/setup.c

+18 −1
Original line number Original line Diff line number Diff line
@@ -105,11 +105,28 @@ static int bcm47xx_get_invariants(struct ssb_bus *bus, 
				  struct ssb_init_invariants *iv)

				  struct ssb_init_invariants *iv)

{

{

	char buf[20];

	char buf[20];

	int len, err;





	/* Fill boardinfo structure */

	/* Fill boardinfo structure */

	memset(&iv->boardinfo, 0 , sizeof(struct ssb_boardinfo));

	memset(&iv->boardinfo, 0 , sizeof(struct ssb_boardinfo));





	bcm47xx_fill_ssb_boardinfo(&iv->boardinfo, NULL);

	len = bcm47xx_nvram_getenv("boardvendor", buf, sizeof(buf));

	if (len > 0) {

		err = kstrtou16(strim(buf), 0, &iv->boardinfo.vendor);

		if (err)

			pr_warn("Couldn't parse nvram board vendor entry with value \"%s\"\n",

				buf);

	}

	if (!iv->boardinfo.vendor)

		iv->boardinfo.vendor = SSB_BOARDVENDOR_BCM;



	len = bcm47xx_nvram_getenv("boardtype", buf, sizeof(buf));

	if (len > 0) {

		err = kstrtou16(strim(buf), 0, &iv->boardinfo.type);

		if (err)

			pr_warn("Couldn't parse nvram board type entry with value \"%s\"\n",

				buf);

	}





	memset(&iv->sprom, 0, sizeof(struct ssb_sprom));

	memset(&iv->sprom, 0, sizeof(struct ssb_sprom));

	bcm47xx_fill_sprom(&iv->sprom, NULL, false);

	bcm47xx_fill_sprom(&iv->sprom, NULL, false);

arch/mips/bcm47xx/sprom.c

+0 −13
Original line number Original line Diff line number Diff line
@@ -599,19 +599,6 @@ void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix, 
	bcm47xx_sprom_fill_auto(sprom, prefix, fallback);

	bcm47xx_sprom_fill_auto(sprom, prefix, fallback);

}

}





#ifdef CONFIG_BCM47XX_SSB

void bcm47xx_fill_ssb_boardinfo(struct ssb_boardinfo *boardinfo,

				const char *prefix)

{

	nvram_read_u16(prefix, NULL, "boardvendor", &boardinfo->vendor, 0,

		       true);

	if (!boardinfo->vendor)

		boardinfo->vendor = SSB_BOARDVENDOR_BCM;



	nvram_read_u16(prefix, NULL, "boardtype", &boardinfo->type, 0, true);

}

#endif



#if defined(CONFIG_BCM47XX_SSB)

#if defined(CONFIG_BCM47XX_SSB)

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

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

{

{

arch/mips/include/asm/mach-bcm47xx/bcm47xx.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -48,11 +48,6 @@ extern enum bcm47xx_bus_type bcm47xx_bus_type; 
void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix,

void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix,

			bool fallback);

			bool fallback);





#ifdef CONFIG_BCM47XX_SSB

void bcm47xx_fill_ssb_boardinfo(struct ssb_boardinfo *boardinfo,

				const char *prefix);

#endif



void bcm47xx_set_system_type(u16 chip_id);

void bcm47xx_set_system_type(u16 chip_id);





#endif /* __ASM_BCM47XX_H */
 
#endif /* __ASM_BCM47XX_H */