git.openwrt.org Git - openwrt/staging/adrian.git/blob

   1 From b1a0ba8f772d7a6dcb5aa3e856f5bd8274989ebe Mon Sep 17 00:00:00 2001
   2 From: Hans de Goede <hdegoede@redhat.com>
   3 Date: Mon, 22 Apr 2019 22:41:23 +0200
   4 Subject: [PATCH] brcmfmac: Add DMI nvram filename quirk for ACEPC T8 and T11
   5  mini PCs
   6
   7 The ACEPC T8 and T11 mini PCs contain quite generic names in the sys_vendor
   8 and product_name DMI strings, without this patch brcmfmac will try to load:
   9 "brcmfmac43455-sdio.Default string-Default string.txt" as nvram file which
  10 is way too generic.
  11
  12 The DMI strings on which we are matching are somewhat generic too, but
  13 "To be filled by O.E.M." is less common then "Default string" and the
  14 system-sku and bios-version strings are pretty unique. Beside the DMI
  15 strings we also check the wifi-module chip-id and revision. I'm confident
  16 that the combination of all this is unique.
  17
  18 Both the T8 and T11 use the same wifi-module, this commit adds DMI
  19 quirks for both mini PCs pointing to brcmfmac43455-sdio.acepc-t8.txt .
  20
  21 BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1690852
  22 Cc: stable@vger.kernel.org
  23 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  24 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  25 ---
  26  .../broadcom/brcm80211/brcmfmac/dmi.c         | 26 +++++++++++++++++++
  27  1 file changed, 26 insertions(+)
  28
  29 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c
  30 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c
  31 @@ -31,6 +31,10 @@ struct brcmf_dmi_data {
  32
  33  /* NOTE: Please keep all entries sorted alphabetically */
  34
  35 +static const struct brcmf_dmi_data acepc_t8_data = {
  36 +       BRCM_CC_4345_CHIP_ID, 6, "acepc-t8"
  37 +};
  38 +
  39  static const struct brcmf_dmi_data gpd_win_pocket_data = {
  40         BRCM_CC_4356_CHIP_ID, 2, "gpd-win-pocket"
  41  };
  42 @@ -49,6 +53,28 @@ static const struct brcmf_dmi_data pov_t
  43
  44  static const struct dmi_system_id dmi_platform_data[] = {
  45         {
  46 +               /* ACEPC T8 Cherry Trail Z8350 mini PC */
  47 +               .matches = {
  48 +                       DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "To be filled by O.E.M."),
  49 +                       DMI_EXACT_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"),
  50 +                       DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "T8"),
  51 +                       /* also match on somewhat unique bios-version */
  52 +                       DMI_EXACT_MATCH(DMI_BIOS_VERSION, "1.000"),
  53 +               },
  54 +               .driver_data = (void *)&acepc_t8_data,
  55 +       },
  56 +       {
  57 +               /* ACEPC T11 Cherry Trail Z8350 mini PC, same wifi as the T8 */
  58 +               .matches = {
  59 +                       DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "To be filled by O.E.M."),
  60 +                       DMI_EXACT_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"),
  61 +                       DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "T11"),
  62 +                       /* also match on somewhat unique bios-version */
  63 +                       DMI_EXACT_MATCH(DMI_BIOS_VERSION, "1.000"),
  64 +               },
  65 +               .driver_data = (void *)&acepc_t8_data,
  66 +       },
  67 +       {
  68                 /* Match for the GPDwin which unfortunately uses somewhat
  69                  * generic dmi strings, which is why we test for 4 strings.
  70                  * Comparing against 23 other byt/cht boards, board_vendor