summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVaibhav Agarwal <vaibhav.agarwal@linaro.org>2016-08-04 12:44:34 +0300
committerGreg Kroah-Hartman <gregkh@google.com>2016-08-04 20:07:30 +0300
commitb7e7dc0083d662c061dcd547c7dde4db24331ebc (patch)
tree31e1fd06bf38a32ca5bba8cbea395f6f8f2a85be
parent487dcbd6ba46548f8f24dbd75423785ec8153712 (diff)
downloadlinux-b7e7dc0083d662c061dcd547c7dde4db24331ebc.tar.xz
greybus: audio: Add id to identify data connection
Added id field to data connection struct. This is used to identify which data connection to use while enabling interface between module & APB. Signed-off-by: Vaibhav Agarwal <vaibhav.agarwal@linaro.org> Reviewed-by: Mark Greer <mgreer@animalcreek.com> Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
-rw-r--r--drivers/staging/greybus/audio_codec.h1
-rw-r--r--drivers/staging/greybus/audio_module.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/greybus/audio_codec.h b/drivers/staging/greybus/audio_codec.h
index c5a8808108db..8cd5bd7a6c31 100644
--- a/drivers/staging/greybus/audio_codec.h
+++ b/drivers/staging/greybus/audio_codec.h
@@ -129,6 +129,7 @@ struct gbaudio_control {
};
struct gbaudio_data_connection {
+ int id;
__le16 data_cport;
int cport_configured;
char name[NAME_SIZE];
diff --git a/drivers/staging/greybus/audio_module.c b/drivers/staging/greybus/audio_module.c
index 7cf523e7f995..9632bc119f87 100644
--- a/drivers/staging/greybus/audio_module.c
+++ b/drivers/staging/greybus/audio_module.c
@@ -199,6 +199,7 @@ static int gb_audio_add_data_connection(struct gbaudio_module_info *gbmodule,
greybus_set_drvdata(bundle, gbmodule);
/* dai->name should be same as codec->dai_name */
strlcpy(dai->name, "greybus-apb1", NAME_SIZE);
+ dai->id = 0;
dai->data_cport = connection->intf_cport_id;
dai->connection = connection;
list_add(&dai->list, &gbmodule->data_list);