| Message ID | 4b9ea75003d78406307cbb392150fb038b1b72f7.1468409668.git.leonard.crestez@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jul 13, 2016 at 1:53 PM, Crestez Dan Leonard <leonard.crestez@intel.com> wrote: > 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> Looks good to me, but Mika needs to have a look at it too. > --- > 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 74e5aea..62a1339 100644 > --- a/drivers/i2c/i2c-core.c > +++ b/drivers/i2c/i2c-core.c > @@ -179,7 +179,13 @@ static int acpi_i2c_get_info(struct acpi_device *adev, > > acpi_dev_free_resource_list(&resource_list); > > - strlcpy(info->type, dev_name(&adev->dev), sizeof(info->type)); > + if (adev->data.of_compatible) { > + ret = acpi_of_modalias(adev, info->type, sizeof(info->type)); > + if (ret) > + return -EINVAL; > + } else { > + strlcpy(info->type, dev_name(&adev->dev), sizeof(info->type)); > + } > > return 0; > } > -- Thanks, Rafael -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Jul 13, 2016 at 02:20:57PM +0200, Rafael J. Wysocki wrote: > On Wed, Jul 13, 2016 at 1:53 PM, Crestez Dan Leonard > <leonard.crestez@intel.com> wrote: > > 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> > > Looks good to me, but Mika needs to have a look at it too. Looks good to me, Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 74e5aea..62a1339 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -179,7 +179,13 @@ static int acpi_i2c_get_info(struct acpi_device *adev, acpi_dev_free_resource_list(&resource_list); - strlcpy(info->type, dev_name(&adev->dev), sizeof(info->type)); + if (adev->data.of_compatible) { + ret = acpi_of_modalias(adev, info->type, sizeof(info->type)); + if (ret) + return -EINVAL; + } else { + strlcpy(info->type, dev_name(&adev->dev), sizeof(info->type)); + } return 0; }
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> --- drivers/i2c/i2c-core.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)