aboutsummaryrefslogtreecommitdiff
path: root/sound/firewire/bebob/bebob_yamaha_terratec.c
diff options
context:
space:
mode:
authorGravatar Takashi Sakamoto <o-takashi@sakamocchi.jp> 2016-08-24 21:42:43 +0900
committerGravatar Takashi Iwai <tiwai@suse.de> 2016-08-24 15:35:11 +0200
commite15c282eff54aaf4c5ed72d492da7060d14f7be8 (patch)
treea42d5bf27191191bba90a0636dcd7958c6ee316e /sound/firewire/bebob/bebob_yamaha_terratec.c
parentALSA: bebob: rename file with vendor-dependent code so that it's for Yamaha/T... (diff)
downloadlinux-e15c282eff54aaf4c5ed72d492da7060d14f7be8.tar.gz
linux-e15c282eff54aaf4c5ed72d492da7060d14f7be8.tar.bz2
linux-e15c282eff54aaf4c5ed72d492da7060d14f7be8.zip
ALSA: bebob: unify configurations for some models produced by Yamaha/Terratec
The below models were developed with a cooperation by Yamaha and Terratec. - Yamaha GO 44/Terratec PHASE 24 FW - Yamaha GO 46/Terratec PHASE X24 FW They have the same configurations, thus it's better to unify corresponding codes. This commit merges them to reduce the amount of maintained codes. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/bebob/bebob_yamaha_terratec.c')
-rw-r--r--sound/firewire/bebob/bebob_yamaha_terratec.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/firewire/bebob/bebob_yamaha_terratec.c b/sound/firewire/bebob/bebob_yamaha_terratec.c
index 5c5d7d3b2397..a6be3e7138e0 100644
--- a/sound/firewire/bebob/bebob_yamaha_terratec.c
+++ b/sound/firewire/bebob/bebob_yamaha_terratec.c
@@ -26,6 +26,9 @@
* Unfortunately current 'ffado-mixer' generated many asynchronous transaction
* to observe device's state, mainly check cmp connection and signal format. I
* recommend users to close ffado-mixer at 192.0kHz if mixer is needless.
+ *
+ * Terratec PHASE 24 FW and PHASE X24 FW are internally the same as
+ * Yamaha GO 44 and GO 46. Yamaha and Terratec had cooperated for these models.
*/
static enum snd_bebob_clock_type clk_src_types[] = {
@@ -55,7 +58,7 @@ static const struct snd_bebob_rate_spec rate_spec = {
.get = &snd_bebob_stream_get_rate,
.set = &snd_bebob_stream_set_rate,
};
-const struct snd_bebob_spec yamaha_go_spec = {
+const struct snd_bebob_spec yamaha_terratec_spec = {
.clock = &clock_spec,
.rate = &rate_spec,
.meter = NULL