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 v5 10/17] soundwire: register master device driver
Date: Tue, 17 Dec 2019 15:03:07 -0600 [thread overview]
Message-ID: <20191217210314.20410-11-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20191217210314.20410-1-pierre-louis.bossart@linux.intel.com>
From: Bard Liao <yung-chuan.liao@linux.intel.com>
While we don't have a matching function, setting an device driver is
still necessary for ASoC to register DAI components as well as power
management.
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
drivers/soundwire/intel.c | 6 ++++++
drivers/soundwire/intel_init.c | 10 ++++++++++
drivers/soundwire/master.c | 1 +
include/linux/soundwire/sdw.h | 1 +
4 files changed, 18 insertions(+)
diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index 36dbcbab0d65..29ebdb07e622 100644
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -17,6 +17,7 @@
#include <linux/soundwire/sdw_registers.h>
#include <linux/soundwire/sdw.h>
#include <linux/soundwire/sdw_intel.h>
+#include <linux/soundwire/sdw_type.h>
#include "cadence_master.h"
#include "bus.h"
#include "intel.h"
@@ -1058,6 +1059,11 @@ static int intel_master_remove(struct sdw_master_device *md)
}
struct sdw_md_driver intel_sdw_driver = {
+ .driver = {
+ .name = "intel-sdw",
+ .owner = THIS_MODULE,
+ .bus = &sdw_bus_type,
+ },
.probe = intel_master_probe,
.startup = intel_master_startup,
.remove = intel_master_remove,
diff --git a/drivers/soundwire/intel_init.c b/drivers/soundwire/intel_init.c
index 42f7ae034bea..a30d95ee71b7 100644
--- a/drivers/soundwire/intel_init.c
+++ b/drivers/soundwire/intel_init.c
@@ -146,6 +146,7 @@ static struct sdw_intel_ctx
struct sdw_master_device *md;
u32 link_mask;
int count;
+ int err;
int i;
if (!res)
@@ -176,6 +177,12 @@ static struct sdw_intel_ctx
link = ctx->links;
link_mask = ctx->link_mask;
+ err = driver_register(&intel_sdw_driver.driver);
+ if (err) {
+ dev_err(&adev->dev, "failed to register sdw master driver\n");
+ goto register_err;
+ }
+
/* Create SDW Master devices */
for (i = 0; i < count; i++, link++) {
if (link_mask && !(link_mask & BIT(i)))
@@ -209,6 +216,8 @@ static struct sdw_intel_ctx
err:
sdw_intel_cleanup(ctx);
link_err:
+ driver_unregister(&intel_sdw_driver.driver);
+register_err:
kfree(ctx);
return NULL;
}
@@ -350,6 +359,7 @@ EXPORT_SYMBOL(sdw_intel_startup);
void sdw_intel_exit(struct sdw_intel_ctx *ctx)
{
sdw_intel_cleanup(ctx);
+ driver_unregister(&intel_sdw_driver.driver);
kfree(ctx);
}
EXPORT_SYMBOL(sdw_intel_exit);
diff --git a/drivers/soundwire/master.c b/drivers/soundwire/master.c
index b018c561708e..1c6bb293468c 100644
--- a/drivers/soundwire/master.c
+++ b/drivers/soundwire/master.c
@@ -46,6 +46,7 @@ struct sdw_master_device *sdw_md_add(struct sdw_md_driver *driver,
md->dev.type = &sdw_md_type;
md->dev.dma_mask = md->dev.parent->dma_mask;
dev_set_name(&md->dev, "sdw-master-%d", md->link_id);
+ md->dev.driver = &driver->driver;
ret = device_register(&md->dev);
if (ret) {
diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h
index f73c355de5e5..58f50257dfa8 100644
--- a/include/linux/soundwire/sdw.h
+++ b/include/linux/soundwire/sdw.h
@@ -630,6 +630,7 @@ struct sdw_md_driver {
int (*remove)(struct sdw_master_device *md);
int (*autonomous_clock_stop_enable)(struct sdw_master_device *md,
bool state);
+ struct device_driver driver;
};
#define SDW_SLAVE_ENTRY(_mfg_id, _part_id, _drv_data) \
--
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-12-17 21:10 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-17 21:02 [alsa-devel] [PATCH v5 00/17] soundwire: intel: implement new ASoC interfaces Pierre-Louis Bossart
2019-12-17 21:02 ` [alsa-devel] [PATCH v5 01/17] soundwire: renames to prepare support for master drivers/devices Pierre-Louis Bossart
2019-12-17 21:02 ` [alsa-devel] [PATCH v5 02/17] soundwire: rename dev_to_sdw_dev macro Pierre-Louis Bossart
2019-12-27 6:54 ` Vinod Koul
2019-12-17 21:03 ` [alsa-devel] [PATCH v5 03/17] soundwire: rename drv_to_sdw_slave_driver macro Pierre-Louis Bossart
2019-12-27 7:00 ` Vinod Koul
2019-12-27 23:23 ` Pierre-Louis Bossart
2019-12-28 12:03 ` Vinod Koul
2019-12-17 21:03 ` [alsa-devel] [PATCH v5 04/17] soundwire: bus_type: rename sdw_drv_ to sdw_slave_drv Pierre-Louis Bossart
2019-12-17 21:03 ` [alsa-devel] [PATCH v5 05/17] soundwire: intel: rename res field as link_res Pierre-Louis Bossart
2019-12-17 21:03 ` [alsa-devel] [PATCH v5 06/17] soundwire: add support for sdw_slave_type Pierre-Louis Bossart
2019-12-27 7:03 ` Vinod Koul
2019-12-27 23:26 ` Pierre-Louis Bossart
2019-12-28 12:05 ` Vinod Koul
2019-12-17 21:03 ` [alsa-devel] [PATCH v5 07/17] soundwire: slave: move uevent handling to slave device level Pierre-Louis Bossart
2019-12-17 21:03 ` [alsa-devel] [PATCH v5 08/17] soundwire: add initial definitions for sdw_master_device Pierre-Louis Bossart
2019-12-27 7:14 ` Vinod Koul
2019-12-27 23:38 ` Pierre-Louis Bossart
2019-12-28 12:09 ` Vinod Koul
2020-01-02 17:36 ` Pierre-Louis Bossart
2020-01-06 5:32 ` Vinod Koul
2019-12-17 21:03 ` [alsa-devel] [PATCH v5 09/17] soundwire: intel: remove platform devices and use 'Master Devices' instead Pierre-Louis Bossart
2019-12-27 9:08 ` Vinod Koul
2019-12-28 0:13 ` Pierre-Louis Bossart
2020-01-06 5:42 ` Vinod Koul
2020-01-06 14:51 ` Pierre-Louis Bossart
2020-01-10 6:43 ` Vinod Koul
2020-01-10 16:08 ` Pierre-Louis Bossart
2020-01-13 5:18 ` Vinod Koul
2020-01-13 15:22 ` Pierre-Louis Bossart
2020-01-14 6:09 ` Vinod Koul
2020-01-14 16:01 ` Pierre-Louis Bossart
2020-01-18 7:12 ` Vinod Koul
2020-01-21 17:31 ` Pierre-Louis Bossart
2020-01-28 10:50 ` Vinod Koul
2020-01-28 16:02 ` Pierre-Louis Bossart
2020-01-29 5:08 ` Vinod Koul
2020-01-29 14:59 ` Pierre-Louis Bossart
2020-02-03 12:02 ` Vinod Koul
2019-12-17 21:03 ` Pierre-Louis Bossart [this message]
2019-12-17 21:03 ` [alsa-devel] [PATCH v5 11/17] soundwire: intel: add prepare support in sdw dai driver Pierre-Louis Bossart
2019-12-17 21:03 ` [alsa-devel] [PATCH v5 12/17] soundwire: intel: add trigger " Pierre-Louis Bossart
2019-12-17 21:03 ` [alsa-devel] [PATCH v5 13/17] soundwire: intel: add sdw_stream_setup helper for .startup callback Pierre-Louis Bossart
2019-12-17 21:03 ` [alsa-devel] [PATCH v5 14/17] soundwire: intel: free all resources on hw_free() Pierre-Louis Bossart
2019-12-17 21:03 ` [alsa-devel] [PATCH v5 15/17] soundwire: intel_init: add implementation of sdw_intel_enable_irq() Pierre-Louis Bossart
2019-12-17 21:03 ` [alsa-devel] [PATCH v5 16/17] soundwire: intel_init: use EXPORT_SYMBOL_NS Pierre-Louis Bossart
2019-12-17 21:03 ` [alsa-devel] [PATCH v5 17/17] soundwire: intel: " 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=20191217210314.20410-11-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).