]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
platform/chrome: cros_ec_spi: Always add of_match_table
authorEvan Green <evgreen@chromium.org>
Thu, 9 May 2019 18:17:50 +0000 (11:17 -0700)
committerEnric Balletbo i Serra <enric.balletbo@collabora.com>
Mon, 20 May 2019 08:18:10 +0000 (10:18 +0200)
The Chrome OS EC driver attaches to devices using the of_match_table
even when ACPI is the underlying firmware. It does this using the
magic PRP0001 ACPI HID, which tells ACPI to go find an OF compatible
string under the hood and match on that.

The cros_ec_spi driver needs to provide the of_match_table regardless
of whether CONFIG_OF is enabled or not, since the table is used by
ACPI for PRP0001 devices.

Signed-off-by: Evan Green <evgreen@chromium.org>
Reviewed-by: Benson Leung <bleung@chromium.org>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
drivers/platform/chrome/cros_ec_spi.c

index 8e9451720e73f59746642e6636d533b8ded46cef..e24bed29d36693b452a0a3bae0ab2050a6feaf56 100644 (file)
@@ -777,7 +777,7 @@ MODULE_DEVICE_TABLE(spi, cros_ec_spi_id);
 static struct spi_driver cros_ec_driver_spi = {
        .driver = {
                .name   = "cros-ec-spi",
-               .of_match_table = of_match_ptr(cros_ec_spi_of_match),
+               .of_match_table = cros_ec_spi_of_match,
                .pm     = &cros_ec_spi_pm_ops,
        },
        .probe          = cros_ec_spi_probe,