[src/trunk]: src/sys/dev/sdmmc Use correct firmware for BCM43456

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3788890dc65f
branches:  trunk
changeset: 968051:3788890dc65f
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Wed Jan 01 12:17:13 2020 +0000

description:
Use correct firmware for BCM43456

diffstat:

 sys/dev/sdmmc/if_bwfm_sdio.c |  16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r 4aaa348fa685 -r 3788890dc65f sys/dev/sdmmc/if_bwfm_sdio.c
--- a/sys/dev/sdmmc/if_bwfm_sdio.c      Wed Jan 01 12:16:14 2020 +0000
+++ b/sys/dev/sdmmc/if_bwfm_sdio.c      Wed Jan 01 12:17:13 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bwfm_sdio.c,v 1.10 2019/12/30 16:28:14 mlelstv Exp $ */
+/* $NetBSD: if_bwfm_sdio.c,v 1.11 2020/01/01 12:17:13 jmcneill Exp $ */
 /* $OpenBSD: if_bwfm_sdio.c,v 1.1 2017/10/11 17:19:50 patrick Exp $ */
 /*
  * Copyright (c) 2010-2016 Broadcom Corporation
@@ -234,6 +234,11 @@
                SDMMC_PRODUCT_BROADCOM_BCM43430, 
                SDMMC_CIS_BROADCOM_BCM43430
        },
+       {
+               SDMMC_VENDOR_BROADCOM,
+               SDMMC_PRODUCT_BROADCOM_BCM43455, 
+               SDMMC_CIS_BROADCOM_BCM43455
+       },
 };
 
 static const char *compatible[] = {
@@ -397,8 +402,13 @@
                nvname = "brcmfmac4334-sdio.txt";
                break;
        case BRCM_CC_4345_CHIP_ID:
-               name = "brcmfmac43455-sdio.bin";
-               nvname = "brcmfmac43455-sdio.txt";
+               if ((0x200 & __BIT(bwfm->sc_chip.ch_chiprev)) != 0) {
+                       name = "brcmfmac43456-sdio.bin";
+                       nvname = "brcmfmac43456-sdio.txt";
+               } else {
+                       name = "brcmfmac43455-sdio.bin";
+                       nvname = "brcmfmac43455-sdio.txt";
+               }
                break;
        case BRCM_CC_43340_CHIP_ID:
                name = "brcmfmac43340-sdio.bin";