diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2011-01-10 10:14:52 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-01-10 10:46:31 -0500 |
commit | 5b8bf2a54fb13e40519ee846ce27bc8a2d7a7878 (patch) | |
tree | 2aa57e62574054f6f9d5d8bf5eb55c72c227e787 /sound/pci/oxygen/oxygen.c | |
parent | bc29e262c3062682c6099bd455ae8544916f723e (diff) |
ALSA: oxygen: simplify model-specific MCLK handling
Replace the get_i2s_mclk callback with tables of MCLK values. This
simplifies the MCLK-handling code in both the framework and the model-
specific drivers.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/oxygen.c')
-rw-r--r-- | sound/pci/oxygen/oxygen.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index fe7ed4fc9f46..784d500c700f 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c | |||
@@ -568,7 +568,6 @@ static const struct oxygen_model model_generic = { | |||
568 | .mixer_init = generic_wm8785_mixer_init, | 568 | .mixer_init = generic_wm8785_mixer_init, |
569 | .cleanup = generic_cleanup, | 569 | .cleanup = generic_cleanup, |
570 | .resume = generic_resume, | 570 | .resume = generic_resume, |
571 | .get_i2s_mclk = oxygen_default_i2s_mclk, | ||
572 | .set_dac_params = set_ak4396_params, | 571 | .set_dac_params = set_ak4396_params, |
573 | .set_adc_params = set_wm8785_params, | 572 | .set_adc_params = set_wm8785_params, |
574 | .update_dac_volume = update_ak4396_volume, | 573 | .update_dac_volume = update_ak4396_volume, |
@@ -589,6 +588,8 @@ static const struct oxygen_model model_generic = { | |||
589 | .dac_volume_max = 255, | 588 | .dac_volume_max = 255, |
590 | .function_flags = OXYGEN_FUNCTION_SPI | | 589 | .function_flags = OXYGEN_FUNCTION_SPI | |
591 | OXYGEN_FUNCTION_ENABLE_SPI_4_5, | 590 | OXYGEN_FUNCTION_ENABLE_SPI_4_5, |
591 | .dac_mclks = OXYGEN_MCLKS(256, 256, 128), | ||
592 | .adc_mclks = OXYGEN_MCLKS(256, 256, 128), | ||
592 | .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | 593 | .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, |
593 | .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | 594 | .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, |
594 | }; | 595 | }; |