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

Commit 4f4aa2ec authored May 18, 2014 by Rafał Miłecki Committed by John W. Linville May 19, 2014

ssb: sprom: add dev_id field for value overriding standard ID



Some devices may have different features despite sharing the same ID
(e.g. PCI ID). For example 14e4:4331 is usually a dual band, but this
can be "limited". Device with "pci/x/y/devid=0x4332" supports 2.4 GHz
only. Similarly 0x4333 will mean support for 5 GHz only.
Add entry in SPROM so info described above can be extracted and stored.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 7a8af8cf

arch/mips/bcm47xx/sprom.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -168,6 +168,7 @@ static void nvram_read_alpha2(const char prefix, const char name,
	static void bcm47xx_fill_sprom_r1234589(struct ssb_sprom *sprom,		static void bcm47xx_fill_sprom_r1234589(struct ssb_sprom *sprom,
	const char *prefix, bool fallback)		const char *prefix, bool fallback)
	{		{
			nvram_read_u16(prefix, NULL, "devid", &sprom->dev_id, 0, fallback);
	nvram_read_u8(prefix, NULL, "ledbh0", &sprom->gpio0, 0xff, fallback);		nvram_read_u8(prefix, NULL, "ledbh0", &sprom->gpio0, 0xff, fallback);
	nvram_read_u8(prefix, NULL, "ledbh1", &sprom->gpio1, 0xff, fallback);		nvram_read_u8(prefix, NULL, "ledbh1", &sprom->gpio1, 0xff, fallback);
	nvram_read_u8(prefix, NULL, "ledbh2", &sprom->gpio2, 0xff, fallback);		nvram_read_u8(prefix, NULL, "ledbh2", &sprom->gpio2, 0xff, fallback);

include/linux/ssb/ssb.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -33,6 +33,7 @@ struct ssb_sprom {
	u8 et1phyaddr; /* MII address for enet1 */		u8 et1phyaddr; /* MII address for enet1 */
	u8 et0mdcport; /* MDIO for enet0 */		u8 et0mdcport; /* MDIO for enet0 */
	u8 et1mdcport; /* MDIO for enet1 */		u8 et1mdcport; /* MDIO for enet1 */
			u16 dev_id; /* Device ID overriding e.g. PCI ID */
	u16 board_rev; /* Board revision number from SPROM. */		u16 board_rev; /* Board revision number from SPROM. */
	u16 board_num; /* Board number from SPROM. */		u16 board_num; /* Board number from SPROM. */
	u16 board_type; /* Board type from SPROM. */		u16 board_type; /* Board type from SPROM. */