| Message ID | 5e1e3da2efb3bb8dea5b49d29585b90cf76891be.1499983092.git.lukas@wunner.de (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 59ebbd5f7b83..e84e5eb23222 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1452,6 +1452,12 @@ static bool acpi_is_spi_i2c_slave(struct acpi_device *device) struct list_head resource_list; bool is_spi_i2c_slave = false; + /* Macs use device properties in lieu of _CRS resources */ + if (is_apple_system && + (fwnode_property_present(&device->fwnode, "spiSclkPeriod") || + fwnode_property_present(&device->fwnode, "i2cAddress"))) + return true; + INIT_LIST_HEAD(&resource_list); acpi_dev_get_resources(device, &resource_list, acpi_check_spi_i2c_slave, &is_spi_i2c_slave);
SPI and I2C slaves are enumerated by their respective parents rather than the ACPI core. They are recognized by presence of _CRS resources, which however are missing on Macs. Check for presence of device properties instead. Cc: Federico Lorenzi <florenzi@gmail.com> Cc: Mika Westerberg <mika.westerberg@linux.intel.com> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reported-and-tested-by: Ronald Tschalär <ronald@innovation.ch> Signed-off-by: Lukas Wunner <lukas@wunner.de> --- Changes v2 -> v3: - Use fwnode_property_present() instead of device_property_present(), the latter doesn't work as the fwnode pointer of the struct device embedded in a struct acpi_device is always NULL. (Ronald) drivers/acpi/scan.c | 6 ++++++ 1 file changed, 6 insertions(+)