diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2008-03-19 03:19:41 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 06:00:28 -0400 |
commit | f009ad9b39e6484d8e36e9e5029c07eab8c12e8f (patch) | |
tree | 79b4bc6bb9c9b9cbf5a410fc8e83120b46bdb310 /sound/pci/oxygen/hifier.c | |
parent | fa5d8106cb52e5df28673f59cc25af520dc83382 (diff) |
[ALSA] oxygen: change model-specific PCM device configuration
When specifying which PCM devices to use, model drivers now use flags
that also specify the routing between PCM devices and DMA channels
instead of just DMA channel bits. This simplifies some code that checks
for these flags.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/hifier.c')
-rw-r--r-- | sound/pci/oxygen/hifier.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/oxygen/hifier.c b/sound/pci/oxygen/hifier.c index 666f69a3312e..fa489ed3ed46 100644 --- a/sound/pci/oxygen/hifier.c +++ b/sound/pci/oxygen/hifier.c | |||
@@ -160,10 +160,10 @@ static const struct oxygen_model model_hifier = { | |||
160 | .update_dac_volume = update_ak4396_volume, | 160 | .update_dac_volume = update_ak4396_volume, |
161 | .update_dac_mute = update_ak4396_mute, | 161 | .update_dac_mute = update_ak4396_mute, |
162 | .model_data_size = sizeof(struct hifier_data), | 162 | .model_data_size = sizeof(struct hifier_data), |
163 | .pcm_dev_cfg = PLAYBACK_0_TO_I2S | | ||
164 | PLAYBACK_1_TO_SPDIF | | ||
165 | CAPTURE_0_FROM_I2S_1, | ||
163 | .dac_channels = 2, | 166 | .dac_channels = 2, |
164 | .used_channels = OXYGEN_CHANNEL_A | | ||
165 | OXYGEN_CHANNEL_SPDIF | | ||
166 | OXYGEN_CHANNEL_MULTICH, | ||
167 | .function_flags = 0, | 167 | .function_flags = 0, |
168 | .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | 168 | .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, |
169 | .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | 169 | .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, |