lkml.org 
[lkml]   [2017]   [Jan]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v3 2/3] i2c: acpi: Initialize info.type from of_compatible
Date
From: Crestez Dan Leonard <leonard.crestez@intel.com>

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@intel.com>
Signed-off-by: Dan O'Donovan <dan@emutex.com>
---
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 583e950..a83dbc7 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -221,7 +221,13 @@ 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));
+ /*
+ * Populate modalias from compatible property if available,
+ * otherwise use native ACPI information
+ */
+ if ((!adev->data.of_compatible) ||
+ acpi_of_modalias(adev, info->type, sizeof(info->type)))
+ strlcpy(info->type, dev_name(&adev->dev), sizeof(info->type));

return 0;
}
--
2.7.4
\
 
 \ /
  Last update: 2017-01-23 17:47    [W:0.281 / U:1.332 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site