From: patrick <patrick@openbsd.org>
Date: Mon, 16 Jul 2018 13:46:17 +0000 (+0000)
Subject: Add support for the BCM43455 SDIO chip to bwfm(4).
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=315a0156f14da9ad95531faadc2fb34739b4d968;p=openbsd

Add support for the BCM43455 SDIO chip to bwfm(4).
---

diff --git a/sys/dev/ic/bwfm.c b/sys/dev/ic/bwfm.c
index 3196c6a9370..27c5307c9f0 100644
--- a/sys/dev/ic/bwfm.c
+++ b/sys/dev/ic/bwfm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bwfm.c,v 1.51 2018/07/16 11:52:26 patrick Exp $ */
+/* $OpenBSD: bwfm.c,v 1.52 2018/07/16 13:46:17 patrick Exp $ */
 /*
  * Copyright (c) 2010-2016 Broadcom Corporation
  * Copyright (c) 2016,2017 Patrick Wildt <patrick@blueri.se>
@@ -1089,6 +1089,7 @@ bwfm_chip_sr_capable(struct bwfm_softc *sc)
 		return 0;
 
 	switch (sc->sc_chip.ch_chip) {
+	case BRCM_CC_4345_CHIP_ID:
 	case BRCM_CC_4354_CHIP_ID:
 	case BRCM_CC_4356_CHIP_ID:
 		core = bwfm_chip_get_pmu(sc);
diff --git a/sys/dev/sdmmc/if_bwfm_sdio.c b/sys/dev/sdmmc/if_bwfm_sdio.c
index ff0026019c4..38ac463889c 100644
--- a/sys/dev/sdmmc/if_bwfm_sdio.c
+++ b/sys/dev/sdmmc/if_bwfm_sdio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bwfm_sdio.c,v 1.21 2018/07/16 13:41:19 patrick Exp $ */
+/* $OpenBSD: if_bwfm_sdio.c,v 1.22 2018/07/16 13:46:17 patrick Exp $ */
 /*
  * Copyright (c) 2010-2016 Broadcom Corporation
  * Copyright (c) 2016,2017 Patrick Wildt <patrick@blueri.se>
@@ -217,6 +217,7 @@ bwfm_sdio_match(struct device *parent, void *match, void *aux)
 	case 0xa94d:
 	case 0xa962:
 	case 0xa9a6:
+	case 0xa9bf:
 		break;
 	default:
 		return 0;
@@ -352,6 +353,10 @@ bwfm_sdio_preinit(struct bwfm_softc *bwfm)
 		name = "brcmfmac4334-sdio.bin";
 		nvname = "brcmfmac4334-sdio.nvram";
 		break;
+	case BRCM_CC_4345_CHIP_ID:
+		name = "brcmfmac43455-sdio.bin";
+		nvname = "brcmfmac43455-sdio.nvram";
+		break;
 	case BRCM_CC_43340_CHIP_ID:
 		name = "brcmfmac43340-sdio.bin";
 		nvname = "brcmfmac43340-sdio.nvram";