[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAJZ5v0jPfx0DEKkfJ8ma2_+emtbSrCv3KrmRGP7gG-6j6h3yfw@mail.gmail.com>
Date: Wed, 13 Jul 2016 14:22:02 +0200
From: "Rafael J. Wysocki" <rafael@...nel.org>
To: Crestez Dan Leonard <leonard.crestez@...el.com>
Cc: ACPI Devel Maling List <linux-acpi@...r.kernel.org>,
"Rafael J. Wysocki" <rjw@...ysocki.net>,
Jarkko Nikula <jarkko.nikula@...el.com>,
Mika Westerberg <mika.westerberg@...ux.intel.com>,
Len Brown <lenb@...nel.org>,
linux-i2c <linux-i2c@...r.kernel.org>,
Wolfram Sang <wsa@...-dreams.de>,
linux-spi <linux-spi@...r.kernel.org>,
Mark Brown <broonie@...nel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Octavian Purdila <octavian.purdila@...el.com>
Subject: Re: [PATCH v2 3/3] acpi spi: Initialize modalias from of_compatible
On Wed, Jul 13, 2016 at 1:53 PM, Crestez Dan Leonard
<leonard.crestez@...el.com> 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@...el.com>
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
Powered by blists - more mailing lists