diff options
author | Andy Owen <andy-alsa@ultra-premium.com> | 2010-10-23 07:12:30 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-10-23 10:58:50 -0400 |
commit | 9bfd94132dd97b76af41024eb7e980a5cb41afee (patch) | |
tree | 5c8da8b3ac2b96f533a54b3c270a9928e797a4cf /sound/pci/ca0106 | |
parent | 51630142ed7da31618c0aca8f2767824834e18a8 (diff) |
ALSA: ca0106: Move enabling of front dac out of hardcoded setup sequence.
Signed-off-by: Andy Owen <andy-alsa@ultra-premium.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ca0106')
-rw-r--r-- | sound/pci/ca0106/ca0106_main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index 22d2f6b6a05f..46ae98d9cb49 100644 --- a/sound/pci/ca0106/ca0106_main.c +++ b/sound/pci/ca0106/ca0106_main.c | |||
@@ -1385,7 +1385,7 @@ static unsigned int spi_dac_init[] = { | |||
1385 | SPI_REG(12, 0x00), | 1385 | SPI_REG(12, 0x00), |
1386 | SPI_REG(SPI_LDA4_REG, SPI_DA_BIT_0dB), | 1386 | SPI_REG(SPI_LDA4_REG, SPI_DA_BIT_0dB), |
1387 | SPI_REG(SPI_RDA4_REG, SPI_DA_BIT_0dB | SPI_DA_BIT_UPDATE), | 1387 | SPI_REG(SPI_RDA4_REG, SPI_DA_BIT_0dB | SPI_DA_BIT_UPDATE), |
1388 | SPI_REG(SPI_DACD4_REG, 0x00), | 1388 | SPI_REG(SPI_DACD4_REG, SPI_DACD4_BIT), |
1389 | }; | 1389 | }; |
1390 | 1390 | ||
1391 | static unsigned int i2c_adc_init[][2] = { | 1391 | static unsigned int i2c_adc_init[][2] = { |
@@ -1576,6 +1576,9 @@ static void ca0106_init_chip(struct snd_ca0106 *chip, int resume) | |||
1576 | if (reg < ARRAY_SIZE(chip->spi_dac_reg)) | 1576 | if (reg < ARRAY_SIZE(chip->spi_dac_reg)) |
1577 | chip->spi_dac_reg[reg] = spi_dac_init[n]; | 1577 | chip->spi_dac_reg[reg] = spi_dac_init[n]; |
1578 | } | 1578 | } |
1579 | |||
1580 | /* Enable front dac only */ | ||
1581 | snd_ca0106_pcm_power_dac(chip, PCM_FRONT_CHANNEL, 1); | ||
1579 | } | 1582 | } |
1580 | } | 1583 | } |
1581 | 1584 | ||