summaryrefslogtreecommitdiffstats
path: root/sound/pci/ice1712/juli.c
diff options
context:
space:
mode:
authorPavel Hofman2009-09-16 22:25:40 +0200
committerTakashi Iwai2009-09-21 15:48:00 +0200
commit1ff97cb9dd9f53b33ce6710a4f861f43e70e8ca4 (patch)
treeb368fa7a43d062940e5fb29c31b609b16bc7bd9d /sound/pci/ice1712/juli.c
parentALSA: ice1724 - pro-rate-locking makes sense only for internal clock mode (diff)
downloadkernel-qcow2-linux-1ff97cb9dd9f53b33ce6710a4f861f43e70e8ca4.tar.gz
kernel-qcow2-linux-1ff97cb9dd9f53b33ce6710a4f861f43e70e8ca4.tar.xz
kernel-qcow2-linux-1ff97cb9dd9f53b33ce6710a4f861f43e70e8ca4.zip
ALSA: ice1724 - Support for multiple external clock types
* Support for customization of the external clock names * Adding hooks to playback_pro_open and capture_pro_open, allowing e.g. limiting available stream rates to a single value when the external clock rate is detected Signed-off-by: Pavel Hofman <pavel.hofman@ivitera.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ice1712/juli.c')
-rw-r--r--sound/pci/ice1712/juli.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c
index 4789e8bfdc17..4bed9633a4cd 100644
--- a/sound/pci/ice1712/juli.c
+++ b/sound/pci/ice1712/juli.c
@@ -529,13 +529,14 @@ static inline unsigned char juli_set_mclk(struct snd_ice1712 *ice,
}
/* setting clock to external - SPDIF */
-static void juli_set_spdif_clock(struct snd_ice1712 *ice)
+static int juli_set_spdif_clock(struct snd_ice1712 *ice, int type)
{
unsigned int old;
old = ice->gpio.get_data(ice);
/* external clock (= 0), multiply 1x, 48kHz */
ice->gpio.set_data(ice, (old & ~GPIO_RATE_MASK) | GPIO_MULTI_1X |
GPIO_FREQ_48KHZ);
+ return 0;
}
/* Called when ak4114 detects change in the input SPDIF stream */