diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-10 17:17:35 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-10 17:38:41 (GMT) |
| commit | d1c1437062db9f56ae7b3abc818fbacacf932d3f (patch) | |
| tree | 21a8beb288cad7ee520cfa31521a933b60272a9d /drivers | |
| parent | 49c68a21d4f308d67b8a4ff8bcf5cd3af53f027d (diff) | |
| download | linux-d1c1437062db9f56ae7b3abc818fbacacf932d3f.tar.xz | |
platform/chrome: pstore: fix dmi table to match all chrome systems
Turns out that DMI_SYSTEM_VENDOR is actually the native vendor of each
Chromebook/box. I tested the original patch on a Pixel that -- surprise,
has Google as vendor. *facepalm*.
The only other data I can think of to probe on is Google_* in the version
string. Checking with our firmware team, all systems should have this
and nothing else than Chrome hardware should have the coreboot + Google_*
combination to date.
So, we'll switch to this. For future platforms we are going to move to
using an ACPI device to configure this instead of a DMI table (yay!),
so longer-term that will sort itself out.
Signed-off-by: Olof Johansson <olof@lixom.net>
Reviewed-by: Benson Leung <bleung@chromium.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/platform/chrome/chromeos_pstore.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/platform/chrome/chromeos_pstore.c b/drivers/platform/chrome/chromeos_pstore.c index e0e0e65..3474920 100644 --- a/drivers/platform/chrome/chromeos_pstore.c +++ b/drivers/platform/chrome/chromeos_pstore.c @@ -16,23 +16,13 @@ static struct dmi_system_id chromeos_pstore_dmi_table[] __initdata = { { /* - * Today all Chromebooks/boxes ship with GOOGLE as vendor and + * Today all Chromebooks/boxes ship with Google_* as version and * coreboot as bios vendor. No other systems with this * combination are known to date. */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"), - DMI_MATCH(DMI_BIOS_VENDOR, "coreboot"), - }, - }, - { - /* - * The first Samsung Chromebox and Chromebook Series 5 550 use - * coreboot but with Samsung as the system vendor. - */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG"), DMI_MATCH(DMI_BIOS_VENDOR, "coreboot"), + DMI_MATCH(DMI_BIOS_VERSION, "Google_"), }, }, { |