From: Crestez Dan Leonard <leonard.crestez@intel.com>
To: linux-acpi@vger.kernel.org,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Crestez Dan Leonard <leonard.crestez@intel.com>,
Len Brown <lenb@kernel.org>,
linux-i2c@vger.kernel.org, Wolfram Sang <wsa@the-dreams.de>,
linux-spi@vger.kernel.org, Mark Brown <broonie@kernel.org>,
linux-kernel@vger.kernel.org,
Octavian Purdila <octavian.purdila@intel.com>
Subject: [PATCH 3/3] acpi spi: Initialize modalias from of_compatible
Date: Wed, 15 Jun 2016 21:30:29 +0300 [thread overview]
Message-ID: <40e5cbb0aa638c619fc7fe9f1dbfaa50e888c2ac.1466014238.git.leonard.crestez@intel.com> (raw)
In-Reply-To: <cover.1466014238.git.leonard.crestez@intel.com>
In-Reply-To: <cover.1466014238.git.leonard.crestez@intel.com>
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@intel.com>
---
drivers/spi/spi.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 77e6e45..eef5ac2 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1680,11 +1680,19 @@ static acpi_status acpi_spi_add_device(acpi_handle handle, u32 level,
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);
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.5.5
next prev parent reply other threads:[~2016-06-15 18:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-15 18:30 [PATCH 0/3] Init device ids from ACPI of_compatible Crestez Dan Leonard
2016-06-15 18:30 ` [PATCH 1/3] acpi: Export acpi_of_modalias equiv of of_modalias_node Crestez Dan Leonard
2016-06-16 8:04 ` Mika Westerberg
2016-06-15 18:30 ` [PATCH 2/3] acpi i2c: Initialize info.type from of_compatible Crestez Dan Leonard
2016-06-16 8:11 ` Mika Westerberg
2016-06-17 12:07 ` Crestez Dan Leonard
2016-06-17 12:19 ` Mika Westerberg
2016-06-15 18:30 ` Crestez Dan Leonard [this message]
2016-06-16 8:12 ` [PATCH 3/3] acpi spi: Initialize modalias " Mika Westerberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=40e5cbb0aa638c619fc7fe9f1dbfaa50e888c2ac.1466014238.git.leonard.crestez@intel.com \
--to=leonard.crestez@intel.com \
--cc=broonie@kernel.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=octavian.purdila@intel.com \
--cc=rjw@rjwysocki.net \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).