summaryrefslogtreecommitdiffstats
path: root/drivers/platform/chrome
diff options
context:
space:
mode:
authorEvan Green2019-05-09 20:17:50 +0200
committerEnric Balletbo i Serra2019-05-20 10:18:10 +0200
commit75501d2edc8044af145a2c237b0ccc2c03deb4ab (patch)
treeeaabb74ba0dbebe464be811f3d1bf3773c4ea659 /drivers/platform/chrome
parentplatform/chrome: wilco_ec: Remove 256 byte transfers (diff)
downloadkernel-qcow2-linux-75501d2edc8044af145a2c237b0ccc2c03deb4ab.tar.gz
kernel-qcow2-linux-75501d2edc8044af145a2c237b0ccc2c03deb4ab.tar.xz
kernel-qcow2-linux-75501d2edc8044af145a2c237b0ccc2c03deb4ab.zip
platform/chrome: cros_ec_spi: Always add of_match_table
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>
Diffstat (limited to 'drivers/platform/chrome')
-rw-r--r--drivers/platform/chrome/cros_ec_spi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/chrome/cros_ec_spi.c b/drivers/platform/chrome/cros_ec_spi.c
index 8e9451720e73..e24bed29d366 100644
--- a/drivers/platform/chrome/cros_ec_spi.c
+++ b/drivers/platform/chrome/cros_ec_spi.c
@@ -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,