When using devicetree i2c_board_info.type is set to the compatible string with the vendor prefix removed. For I2C devices described via ACPI the i2c_board_info.type string is set to the ACPI device name. When using ACPI and DT ids this string ends up something like "PRP0001:00".
If the of_compatible property is present try to use that instead. This makes it easier to instantiate i2c drivers through ACPI with DT ids. Signed-off-by: Crestez Dan Leonard <[email protected]> --- drivers/i2c/i2c-core.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index af11b65..5ab1fb9 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -188,8 +188,14 @@ static acpi_status acpi_i2c_add_device(acpi_handle handle, u32 level, acpi_dev_free_resource_list(&resource_list); + if (adev->data.of_compatible) { + ret = acpi_of_modalias(adev, info.type, sizeof(info.type)); + if (ret) + return -EINVAL; + } else + strlcpy(info.type, dev_name(&adev->dev), sizeof(info.type)); + adev->power.flags.ignore_parent = true; - strlcpy(info.type, dev_name(&adev->dev), sizeof(info.type)); if (!i2c_new_device(adapter, &info)) { adev->power.flags.ignore_parent = false; dev_err(&adapter->dev, -- 2.5.5
