From: Charles Keepax <ckeepax@opensource.cirrus.com>
To: <broonie@kernel.org>, <linus.walleij@linaro.org>, <brgl@bgdev.pl>
Cc: <linux-gpio@vger.kernel.org>, <linux-spi@vger.kernel.org>,
<patches@opensource.cirrus.com>
Subject: [PATCH v2 2/3] spi: Add a mechanism to use the fwnode name for the SPI device
Date: Thu, 28 Mar 2024 14:01:18 +0000 [thread overview]
Message-ID: <20240328140119.1784350-3-ckeepax@opensource.cirrus.com> (raw)
In-Reply-To: <20240328140119.1784350-1-ckeepax@opensource.cirrus.com>
Add a mechanism to force the use of the fwnode name for the name of the
SPI device itself. This is useful when devices need to be manually added
within the kernel.
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---
No changes since v1.
Thanks,
Charles
drivers/spi/spi.c | 7 +++++++
include/linux/spi/spi.h | 2 ++
2 files changed, 9 insertions(+)
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index a2f01116ba092..a38a4960032b8 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -598,6 +598,12 @@ EXPORT_SYMBOL_GPL(spi_alloc_device);
static void spi_dev_set_name(struct spi_device *spi)
{
struct acpi_device *adev = ACPI_COMPANION(&spi->dev);
+ struct fwnode_handle *fwnode = dev_fwnode(&spi->dev);
+
+ if (spi->use_fwnode_name && fwnode) {
+ dev_set_name(&spi->dev, "spi-%s", fwnode_get_name(fwnode));
+ return;
+ }
if (adev) {
dev_set_name(&spi->dev, "spi-%s", acpi_dev_name(adev));
@@ -830,6 +836,7 @@ struct spi_device *spi_new_device(struct spi_controller *ctlr,
* spi->cs_index_mask as 0x01.
*/
proxy->cs_index_mask = 0x01;
+ proxy->use_fwnode_name = chip->use_fwnode_name;
if (chip->swnode) {
status = device_add_software_node(&proxy->dev, chip->swnode);
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index b589e25474393..265f5d0c15304 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -222,6 +222,7 @@ struct spi_device {
struct spi_delay cs_setup;
struct spi_delay cs_hold;
struct spi_delay cs_inactive;
+ bool use_fwnode_name;
/* The statistics */
struct spi_statistics __percpu *pcpu_statistics;
@@ -1603,6 +1604,7 @@ struct spi_board_info {
char modalias[SPI_NAME_SIZE];
const void *platform_data;
const struct software_node *swnode;
+ bool use_fwnode_name;
void *controller_data;
int irq;
--
2.39.2
next prev parent reply other threads:[~2024-03-28 14:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-28 14:01 [PATCH 0/3] Add bridged amplifiers to cs42l43 Charles Keepax
2024-03-28 14:01 ` [PATCH v2 1/3] gpio: swnode: Add ability to specify native chip selects for SPI Charles Keepax
2024-03-28 14:01 ` Charles Keepax [this message]
2024-03-28 14:01 ` [PATCH v2 3/3] spi: cs42l43: Add bridged cs35l56 amplifiers Charles Keepax
2024-03-28 15:37 ` Dan Carpenter
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=20240328140119.1784350-3-ckeepax@opensource.cirrus.com \
--to=ckeepax@opensource.cirrus.com \
--cc=brgl@bgdev.pl \
--cc=broonie@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.