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

MIPS: bcm47xx: refactor fetching board data 



Now the fetching of board data also uses nvram_read_u16 and not
simple_strtoul any more.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Acked-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5a20ef3d

arch/mips/bcm47xx/setup.c

+1 −6
Original line number Diff line number Diff line
@@ -109,12 +109,7 @@ static int bcm47xx_get_invariants(struct ssb_bus *bus, 
	/* Fill boardinfo structure */

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



	if (nvram_getenv("boardvendor", buf, sizeof(buf)) >= 0)

		iv->boardinfo.vendor = (u16)simple_strtoul(buf, NULL, 0);

	else

		iv->boardinfo.vendor = SSB_BOARDVENDOR_BCM;

	if (nvram_getenv("boardtype", buf, sizeof(buf)) >= 0)

		iv->boardinfo.type = (u16)simple_strtoul(buf, NULL, 0);

	bcm47xx_fill_ssb_boardinfo(&iv->boardinfo, NULL);



	bcm47xx_fill_sprom(&iv->sprom, NULL);

arch/mips/bcm47xx/sprom.c

+12 −0
Original line number Diff line number Diff line
@@ -618,3 +618,15 @@ void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix) 
		bcm47xx_fill_sprom_r1(sprom, prefix);

	}

}



#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);

	if (!boardinfo->vendor)

		boardinfo->vendor = SSB_BOARDVENDOR_BCM;



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

}

#endif

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

+5 −0
Original line number Diff line number Diff line
@@ -47,4 +47,9 @@ extern enum bcm47xx_bus_type bcm47xx_bus_type; 
void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix);

void bcm47xx_fill_sprom_ethernet(struct ssb_sprom *sprom, const char *prefix);



#ifdef CONFIG_BCM47XX_SSB

void bcm47xx_fill_ssb_boardinfo(struct ssb_boardinfo *boardinfo,

				const char *prefix);

#endif



#endif /* __ASM_BCM47XX_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE