diff options
| author |   patrick <patrick@openbsd.org> | 2020-01-22 12:08:55 +0000 |
|---|---|---|
| committer | patrick <patrick@openbsd.org> | 2020-01-22 12:08:55 +0000 |
| commit | 42b5d655ebc75bd34460e44c42bf8884c2c5bd14 (patch) | |
| tree | 11d55e0bdb960fd3ddaf1d9b6b2de6f9fb31ca1f | |
| parent | Ack SDIO interrupts earlier on dwmmc(4). While handling an SDIO (diff) | |
| download | wireguard-openbsd-42b5d655ebc75bd34460e44c42bf8884c2c5bd14.tar.xz wireguard-openbsd-42b5d655ebc75bd34460e44c42bf8884c2c5bd14.zip | |
Recognize BCM4345 rev 9, which requires a different firmware,
as shipped with the Pinebook Pro as an AMPAK AP6256 module.
| -rw-r--r-- | sys/dev/sdmmc/if_bwfm_sdio.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/dev/sdmmc/if_bwfm_sdio.c b/sys/dev/sdmmc/if_bwfm_sdio.c index 20c6fe94dcf..440bbae72d8 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.29 2019/02/07 07:39:56 patrick Exp $ */ +/* $OpenBSD: if_bwfm_sdio.c,v 1.30 2020/01/22 12:08:55 patrick Exp $ */ /* * Copyright (c) 2010-2016 Broadcom Corporation * Copyright (c) 2016,2017 Patrick Wildt <patrick@blueri.se> @@ -368,8 +368,13 @@ bwfm_sdio_preinit(struct bwfm_softc *bwfm) nvname = "brcmfmac4334-sdio.nvram"; break; case BRCM_CC_4345_CHIP_ID: - name = "brcmfmac43455-sdio.bin"; - nvname = "brcmfmac43455-sdio.nvram"; + if (bwfm->sc_chip.ch_chiprev == 9) { + name = "brcmfmac43456-sdio.bin"; + nvname = "brcmfmac43456-sdio.nvram"; + } else { + name = "brcmfmac43455-sdio.bin"; + nvname = "brcmfmac43455-sdio.nvram"; + } break; case BRCM_CC_43340_CHIP_ID: name = "brcmfmac43340-sdio.bin"; |