lkml.org 
[lkml]   [2017]   [Feb]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 3/3] spi: acpi: Initialize modalias from of_compatible
    Date
    When using devicetree spi_device.modalias is set to the compatible
    string with the vendor prefix removed. For SPI devices described via
    ACPI the spi_device.modalias 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: 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/spi/spi.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
    index 656dd3e..d9afc32 100644
    --- a/drivers/spi/spi.c
    +++ b/drivers/spi/spi.c
    @@ -1722,13 +1722,15 @@ static acpi_status acpi_register_spi_device(struct spi_master *master,
    return AE_OK;
    }

    + acpi_set_modalias(adev, acpi_device_hid(adev),
    + spi->modalias, 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",
    --
    2.7.4
    \
     
     \ /
      Last update: 2017-02-04 09:04    [W:4.121 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site