Skip to content

Commit

Permalink
i2c: acpi: Initialize info.type from of_compatible
Browse files Browse the repository at this point in the history
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: Dan O'Donovan <dan@emutex.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Tested-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Acked-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Dan O'Donovan authored and Rafael J. Wysocki committed Feb 7, 2017
1 parent 51ede5d commit 622b307
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/i2c/i2c-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,8 @@ static int i2c_acpi_get_info(struct acpi_device *adev,

acpi_dev_free_resource_list(&resource_list);

strlcpy(info->type, dev_name(&adev->dev), sizeof(info->type));
acpi_set_modalias(adev, dev_name(&adev->dev), info->type,
sizeof(info->type));

return 0;
}
Expand Down

0 comments on commit 622b307

Please sign in to comment.