On Wed, Jul 13, 2016 at 1:53 PM, Crestez Dan Leonard
<leonard.crestez@xxxxxxxxx> wrote:
> When using devicetree spi_device.modalias is set to the compatible
> string with the vendor prefix removed. For SPI devices described via
> ACPI the i2c_board_info.type string is initialized by acpi_device_hid.
> When using ACPI and DT ids this string ends up something like "PRP0001".
>
> Change acpi_register_spi_device to use the of_compatible property if
> present. This makes it easier to instantiate spi drivers through ACPI
> with DT ids.
>
> Signed-off-by: Crestez Dan Leonard <leonard.crestez@xxxxxxxxx>
Same as for the i2c patch: it looks good to me, but I'd prefer to get
a word from Mika on it too.
> ---
> drivers/spi/spi.c | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
> index 7589c8a..49fdf6e 100644
> --- a/drivers/spi/spi.c
> +++ b/drivers/spi/spi.c
> @@ -1679,13 +1679,22 @@ static acpi_status acpi_register_spi_device(struct spi_master *master,
> return AE_OK;
> }
>
> + if (adev->data.of_compatible) {
> + ret = acpi_of_modalias(adev, spi->modalias, sizeof(spi->modalias));
> + if (ret) {
> + spi_dev_put(spi);
> + return AE_NOT_FOUND;
> + }
> + } else {
> + strlcpy(spi->modalias, acpi_device_hid(adev), sizeof(spi->modalias));
> + }
> +
> if (spi->irq < 0)
> spi->irq = acpi_dev_gpio_irq_get(adev, 0);
>
> acpi_device_set_enumerated(adev);
>
> adev->power.flags.ignore_parent = true;
> - strlcpy(spi->modalias, acpi_device_hid(adev), sizeof(spi->modalias));
> if (spi_add_device(spi)) {
> adev->power.flags.ignore_parent = false;
> dev_err(&master->dev, "failed to add SPI device %s from ACPI\n",
> --
Thanks,
Rafael
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
