Skip to content

Commit 3ecc72b

Browse files
jwrdegoedeksacilotto
authored andcommitted
brcmfmac: Add DMI nvram filename quirk for Voyo winpad A15 tablet
BugLink: https://bugs.launchpad.net/bugs/1920235 [ Upstream commit a338c87 ] The Voyo winpad A15 tablet contains quite generic names in the sys_vendor and product_name DMI strings, without this patch brcmfmac will try to load: rcmfmac4330-sdio.To be filled by O.E.M.-To be filled by O.E.M..txt as nvram file which is a bit too generic. Add a DMI quirk so that a unique and clearly identifiable nvram file name is used on the Voyo winpad A15 tablet. While preparing a matching linux-firmware update I noticed that the nvram is identical to the nvram used on the Prowise-PT301 tablet, so the new DMI quirk entry simply points to the already existing Prowise-PT301 nvram file. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Link: https://lore.kernel.org/r/20210129171413.139880-2-hdegoede@redhat.com Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
1 parent 75ae9ec commit 3ecc72b

File tree

1 file changed

+18
-0
lines changed
  • drivers/net/wireless/broadcom/brcm80211/brcmfmac

1 file changed

+18
-0
lines changed

drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,14 @@ static const struct brcmf_dmi_data predia_basic_data = {
4444
BRCM_CC_43341_CHIP_ID, 2, "predia-basic"
4545
};
4646

47+
/* Note the Voyo winpad A15 tablet uses the same Ampak AP6330 module, with the
48+
* exact same nvram file as the Prowise-PT301 tablet. Since the nvram for the
49+
* Prowise-PT301 is already in linux-firmware we just point to that here.
50+
*/
51+
static const struct brcmf_dmi_data voyo_winpad_a15_data = {
52+
BRCM_CC_4330_CHIP_ID, 4, "Prowise-PT301"
53+
};
54+
4755
static const struct dmi_system_id dmi_platform_data[] = {
4856
{
4957
/* ACEPC T8 Cherry Trail Z8350 mini PC */
@@ -125,6 +133,16 @@ static const struct dmi_system_id dmi_platform_data[] = {
125133
},
126134
.driver_data = (void *)&predia_basic_data,
127135
},
136+
{
137+
/* Voyo winpad A15 tablet */
138+
.matches = {
139+
DMI_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"),
140+
DMI_MATCH(DMI_BOARD_NAME, "Aptio CRB"),
141+
/* Above strings are too generic, also match on BIOS date */
142+
DMI_MATCH(DMI_BIOS_DATE, "11/20/2014"),
143+
},
144+
.driver_data = (void *)&voyo_winpad_a15_data,
145+
},
128146
{}
129147
};
130148

0 commit comments

Comments
 (0)