From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
tiwai@suse.de, gregkh@linuxfoundation.org,
linux-kernel@vger.kernel.org,
Ranjani Sridharan <ranjani.sridharan@linux.intel.com>,
vkoul@kernel.org, broonie@kernel.org,
srinivas.kandagatla@linaro.org, jank@cadence.com,
slawomir.blauciak@intel.com,
Sanyog Kale <sanyog.r.kale@intel.com>,
Bard liao <yung-chuan.liao@linux.intel.com>,
Rander Wang <rander.wang@linux.intel.com>
Subject: [alsa-devel] [PATCH v2 06/14] soundwire: add support for sdw_slave_type
Date: Wed, 6 Nov 2019 13:13:50 -0600 [thread overview]
Message-ID: <20191106191358.5712-7-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20191106191358.5712-1-pierre-louis.bossart@linux.intel.com>
Currently the bus does not have any explicit support for master
devices.
First add explicit support for sdw_slave_type and error checks if this type
is not set.
In follow-up patches we can add support for the sdw_md_type (md==Master
Device), following the Grey Bus example.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
drivers/soundwire/bus_type.c | 16 ++++++++++++----
drivers/soundwire/slave.c | 7 ++++++-
include/linux/soundwire/sdw_type.h | 6 ++++++
3 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/drivers/soundwire/bus_type.c b/drivers/soundwire/bus_type.c
index 9a0fd3ee1014..bbdedce5eb26 100644
--- a/drivers/soundwire/bus_type.c
+++ b/drivers/soundwire/bus_type.c
@@ -49,13 +49,21 @@ int sdw_slave_modalias(const struct sdw_slave *slave, char *buf, size_t size)
static int sdw_uevent(struct device *dev, struct kobj_uevent_env *env)
{
- struct sdw_slave *slave = to_sdw_slave_device(dev);
+ struct sdw_slave *slave;
char modalias[32];
- sdw_slave_modalias(slave, modalias, sizeof(modalias));
+ if (is_sdw_slave(dev)) {
+ slave = to_sdw_slave_device(dev);
+
+ sdw_slave_modalias(slave, modalias, sizeof(modalias));
- if (add_uevent_var(env, "MODALIAS=%s", modalias))
- return -ENOMEM;
+ if (add_uevent_var(env, "MODALIAS=%s", modalias))
+ return -ENOMEM;
+ } else {
+ /* only Slave device type supported */
+ dev_warn(dev, "uevent for unknown Soundwire type\n");
+ return -EINVAL;
+ }
return 0;
}
diff --git a/drivers/soundwire/slave.c b/drivers/soundwire/slave.c
index 48a513680db6..c87267f12a3b 100644
--- a/drivers/soundwire/slave.c
+++ b/drivers/soundwire/slave.c
@@ -14,6 +14,11 @@ static void sdw_slave_release(struct device *dev)
kfree(slave);
}
+struct device_type sdw_slave_type = {
+ .name = "sdw_slave",
+ .release = sdw_slave_release,
+};
+
static int sdw_slave_add(struct sdw_bus *bus,
struct sdw_slave_id *id, struct fwnode_handle *fwnode)
{
@@ -41,9 +46,9 @@ static int sdw_slave_add(struct sdw_bus *bus,
id->class_id, id->unique_id);
}
- slave->dev.release = sdw_slave_release;
slave->dev.bus = &sdw_bus_type;
slave->dev.of_node = of_node_get(to_of_node(fwnode));
+ slave->dev.type = &sdw_slave_type;
slave->bus = bus;
slave->status = SDW_SLAVE_UNATTACHED;
slave->dev_num = 0;
diff --git a/include/linux/soundwire/sdw_type.h b/include/linux/soundwire/sdw_type.h
index 7d4bc6a979bf..c681b3426478 100644
--- a/include/linux/soundwire/sdw_type.h
+++ b/include/linux/soundwire/sdw_type.h
@@ -5,6 +5,12 @@
#define __SOUNDWIRE_TYPES_H
extern struct bus_type sdw_bus_type;
+extern struct device_type sdw_slave_type;
+
+static inline int is_sdw_slave(const struct device *dev)
+{
+ return dev->type == &sdw_slave_type;
+}
#define to_sdw_slave_driver(_drv) \
container_of(_drv, struct sdw_driver, driver)
--
2.20.1
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2019-11-06 19:19 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-06 19:13 [alsa-devel] [PATCH v2 00/14] soundwire: intel: implement new ASoC interfaces Pierre-Louis Bossart
2019-11-06 19:13 ` [alsa-devel] [PATCH v2 01/14] soundwire: renames to prepare support for master drivers/devices Pierre-Louis Bossart
2019-11-06 19:13 ` [alsa-devel] [PATCH v2 02/14] soundwire: rename dev_to_sdw_dev macro Pierre-Louis Bossart
2019-11-06 19:13 ` [alsa-devel] [PATCH v2 03/14] soundwire: rename drv_to_sdw_slave_driver macro Pierre-Louis Bossart
2019-11-06 19:13 ` [alsa-devel] [PATCH v2 04/14] soundwire: bus_type: rename sdw_drv_ to sdw_slave_drv Pierre-Louis Bossart
2019-11-06 19:13 ` [alsa-devel] [PATCH v2 05/14] soundwire: intel: rename res field as link_res Pierre-Louis Bossart
2019-11-06 19:13 ` Pierre-Louis Bossart [this message]
2019-11-06 19:13 ` [alsa-devel] [PATCH v2 07/14] soundwire: add initial definitions for sdw_master_device Pierre-Louis Bossart
2019-11-06 19:13 ` [alsa-devel] [PATCH v2 08/14] soundwire: intel: remove platform devices and provide new interface Pierre-Louis Bossart
2019-11-06 19:13 ` [alsa-devel] [PATCH v2 09/14] soundwire: add device driver to sdw_md_driver Pierre-Louis Bossart
2019-11-06 19:13 ` [alsa-devel] [PATCH v2 10/14] soundwire: intel: add prepare support in sdw dai driver Pierre-Louis Bossart
2019-11-06 19:13 ` [alsa-devel] [PATCH v2 11/14] soundwire: intel: add trigger " Pierre-Louis Bossart
2019-11-06 19:13 ` [alsa-devel] [PATCH v2 12/14] soundwire: intel: add sdw_stream_setup helper for .startup callback Pierre-Louis Bossart
2019-11-06 19:13 ` [alsa-devel] [PATCH v2 13/14] soundwire: intel: free all resources on hw_free() Pierre-Louis Bossart
2019-11-06 19:13 ` [alsa-devel] [PATCH v2 14/14] soundwire: intel_init: add implementation of sdw_intel_enable_irq() Pierre-Louis Bossart
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=20191106191358.5712-7-pierre-louis.bossart@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=jank@cadence.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rander.wang@linux.intel.com \
--cc=ranjani.sridharan@linux.intel.com \
--cc=sanyog.r.kale@intel.com \
--cc=slawomir.blauciak@intel.com \
--cc=srinivas.kandagatla@linaro.org \
--cc=tiwai@suse.de \
--cc=vkoul@kernel.org \
--cc=yung-chuan.liao@linux.intel.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 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).