From: patrick <patrick@openbsd.org>
Date: Wed, 10 Jan 2018 02:15:22 +0000 (+0000)
Subject: Add firmware names for the two revisions of the Broadcom 4350 as seen
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=18b3a1dcf35143296f074f6f311eee1fb416063d;p=openbsd

Add firmware names for the two revisions of the Broadcom 4350 as seen
on a MacBook 12-inch (2017).

Tested by and with jcs@
---

diff --git a/sys/dev/pci/if_bwfm_pci.c b/sys/dev/pci/if_bwfm_pci.c
index 0c3d527cba2..5672b9a7546 100644
--- a/sys/dev/pci/if_bwfm_pci.c
+++ b/sys/dev/pci/if_bwfm_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bwfm_pci.c,v 1.13 2018/01/10 02:07:11 patrick Exp $	*/
+/*	$OpenBSD: if_bwfm_pci.c,v 1.14 2018/01/10 02:15:22 patrick Exp $	*/
 /*
  * Copyright (c) 2010-2016 Broadcom Corporation
  * Copyright (c) 2017 Patrick Wildt <patrick@blueri.se>
@@ -388,15 +388,18 @@ bwfm_pci_attachhook(struct device *self)
 
 	switch (bwfm->sc_chip.ch_chip)
 	{
+	case BRCM_CC_4350_CHIP_ID:
+		if (bwfm->sc_chip.ch_chiprev > 7)
+			name = "brcmfmac4350-pcie.bin";
+		else
+			name = "brcmfmac4350c2-pcie.bin";
+		break;
 	case BRCM_CC_43602_CHIP_ID:
 		name = "brcmfmac43602-pcie.bin";
 		break;
 	default:
-		break;
-	}
-
-	if (name == NULL) {
-		printf("%s: unknown firmware\n", DEVNAME(sc));
+		printf("%s: unknown firmware for chip %s\n",
+		    DEVNAME(sc), bwfm->sc_chip.ch_name);
 		return;
 	}