• Hans de Goede's avatar
    brcmfmac: Call brcmf_dmi_probe before brcmf_of_probe · 554da386
    Hans de Goede authored
    ARM systems with UEFI may have both devicetree (of) and DMI data in this
    case we end up setting brcmf_mp_device.board_type twice.
    
    In this case we should prefer the devicetree data, because:
    1) The devicerree data is more reliable
    2) Some ARM systems (e.g. the Raspberry Pi 3 models) support both UEFI and
       classic uboot booting, the devicetree data is always there, so using it
       makes sure we ask for the same nvram file independent of how we booted.
    
    This commit moves the brcmf_dmi_probe call to before the brcmf_of_probe
    call, so that the latter can override the value of the first if both are
    set.
    
    Fixes: bd1e82bb ("brcmfmac: Set board_type from DMI on x86 based ...")
    Cc: Peter Robinson <pbrobinson@gmail.com>
    Tested-and-reported-by: default avatarPeter Robinson <pbrobinson@gmail.com>
    Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
    Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
    554da386
common.c 14.3 KB