| From 5016634b387add5a7bd1bc801af25ecf1f76ef33 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 29 Jan 2021 18:14:13 +0100 |
| Subject: brcmfmac: Add DMI nvram filename quirk for Voyo winpad A15 tablet |
| |
| From: Hans de Goede <hdegoede@redhat.com> |
| |
| [ Upstream commit a338c874d3d9d2463f031e89ae14942929b93db6 ] |
| |
| 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> |
| --- |
| .../wireless/broadcom/brcm80211/brcmfmac/dmi.c | 18 ++++++++++++++++++ |
| 1 file changed, 18 insertions(+) |
| |
| diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c |
| index 824a79f24383..6d5188b78f2d 100644 |
| --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c |
| +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c |
| @@ -44,6 +44,14 @@ static const struct brcmf_dmi_data predia_basic_data = { |
| BRCM_CC_43341_CHIP_ID, 2, "predia-basic" |
| }; |
| |
| +/* Note the Voyo winpad A15 tablet uses the same Ampak AP6330 module, with the |
| + * exact same nvram file as the Prowise-PT301 tablet. Since the nvram for the |
| + * Prowise-PT301 is already in linux-firmware we just point to that here. |
| + */ |
| +static const struct brcmf_dmi_data voyo_winpad_a15_data = { |
| + BRCM_CC_4330_CHIP_ID, 4, "Prowise-PT301" |
| +}; |
| + |
| static const struct dmi_system_id dmi_platform_data[] = { |
| { |
| /* ACEPC T8 Cherry Trail Z8350 mini PC */ |
| @@ -125,6 +133,16 @@ static const struct dmi_system_id dmi_platform_data[] = { |
| }, |
| .driver_data = (void *)&predia_basic_data, |
| }, |
| + { |
| + /* Voyo winpad A15 tablet */ |
| + .matches = { |
| + DMI_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"), |
| + DMI_MATCH(DMI_BOARD_NAME, "Aptio CRB"), |
| + /* Above strings are too generic, also match on BIOS date */ |
| + DMI_MATCH(DMI_BIOS_DATE, "11/20/2014"), |
| + }, |
| + .driver_data = (void *)&voyo_winpad_a15_data, |
| + }, |
| {} |
| }; |
| |
| -- |
| 2.30.1 |
| |