Commit 622b3077 authored Feb 05, 2017 by Dan O'Donovan Committed by Rafael J. Wysocki Feb 07, 2017

i2c: acpi: Initialize info.type from of_compatible

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>

parent 51ede5d9

drivers/i2c/i2c-core.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}