[PATCH v4 2/3] i2c: acpi: Initialize info.type from of_compatible

From: Dan O'Donovan
Date: Fri Jan 27 2017 - 08:34:42 EST

From: Crestez Dan Leonard <leonard.crestez@xxxxxxxxx>

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 <leonard.crestez@xxxxxxxxx>
Signed-off-by: Dan O'Donovan <dan@xxxxxxxxxx>
Reviewed-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
Reviewed-by: Jarkko Nikula <jarkko.nikula@xxxxxxxxxxxxxxx>
Tested-by: Jarkko Nikula <jarkko.nikula@xxxxxxxxxxxxxxx>
drivers/i2c/i2c-core.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 583e950..6e99431 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -221,7 +221,12 @@ static int i2c_acpi_get_info(struct acpi_device *adev,


- strlcpy(info->type, dev_name(&adev->dev), sizeof(info->type));
+ /*
+ * Populate modalias from compatible property if available,
+ * otherwise use native ACPI information
+ */
+ if (acpi_of_modalias(adev, info->type, sizeof(info->type)))
+ strlcpy(info->type, dev_name(&adev->dev), sizeof(info->type));

return 0;