Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1568366

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

Show all headers | View raw

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>
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>
---
 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,
 
 	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 (acpi_of_modalias(adev, info->type, sizeof(info->type)))
+		strlcpy(info->type, dev_name(&adev->dev), sizeof(info->type));
 
 	return 0;
 }
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 0/3] Init device ids from ACPI of_compatible Dan O'Donovan <dan@emutex.com> - 2017-01-23 17:50 +0100
  [PATCH v3 1/3] ACPI / bus: Export acpi_of_modalias equiv of of_modalias_node Dan O'Donovan <dan@emutex.com> - 2017-01-23 17:50 +0100
  [PATCH v3 3/3] spi: acpi: Initialize modalias from of_compatible Dan O'Donovan <dan@emutex.com> - 2017-01-23 17:50 +0100
    Re: [PATCH v3 3/3] spi: acpi: Initialize modalias from of_compatible Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-01-23 18:20 +0100
      Re: [PATCH v3 3/3] spi: acpi: Initialize modalias from of_compatible Dan O'Donovan <dan@emutex.com> - 2017-01-27 12:20 +0100
        Re: [PATCH v3 3/3] spi: acpi: Initialize modalias from of_compatible Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-01-27 15:00 +0100
    Re: [PATCH v3 3/3] spi: acpi: Initialize modalias from of_compatible "Rafael J. Wysocki" <rafael@kernel.org> - 2017-01-30 10:50 +0100
  Re: [PATCH v3 0/3] Init device ids from ACPI of_compatible Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-01-23 18:20 +0100
  Re: [PATCH v3 0/3] Init device ids from ACPI of_compatible Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-01-24 16:20 +0100
  Re: [PATCH v3 0/3] Init device ids from ACPI of_compatible Jarkko Nikula <jarkko.nikula@intel.com> - 2017-01-24 16:20 +0100
  [PATCH v4 0/3] Init device ids from ACPI of_compatible Dan O'Donovan <dan@emutex.com> - 2017-01-27 14:40 +0100
    [PATCH v4 1/3] ACPI / bus: Export acpi_of_modalias equiv of of_modalias_node Dan O'Donovan <dan@emutex.com> - 2017-01-27 14:40 +0100
    [PATCH v4 3/3] spi: acpi: Initialize modalias from of_compatible Dan O'Donovan <dan@emutex.com> - 2017-01-27 14:40 +0100
    [PATCH v4 2/3] i2c: acpi: Initialize info.type from of_compatible Dan O'Donovan <dan@emutex.com> - 2017-01-27 14:40 +0100
      Re: [PATCH v4 2/3] i2c: acpi: Initialize info.type from of_compatible Wolfram Sang <wsa@the-dreams.de> - 2017-01-28 22:40 +0100

csiph-web