Fix the num_total_dacs setting for Chaintech AV710. The existing comment that only PSDOUT0 is connected is correct, but since the card is using packed AC97 mode to send 6 channels to the codec, num_total_dacs should be set to 6 and not 2. This allows 6-channel surround to work. Also clarify a comment regarding the additional WM8728 codec on this card (it's connected to the SPDIF output and always receives the same data). Signed-off-by: Robert Hancock <hancockrwd@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
		
			
				
	
	
		
			96 lines
		
	
	
	
		
			2.8 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			96 lines
		
	
	
	
		
			2.8 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 *   ALSA driver for ICEnsemble VT1724 (Envy24HT)
 | 
						|
 *
 | 
						|
 *   Lowlevel functions for Advanced Micro Peripherals Ltd AUDIO2000
 | 
						|
 *
 | 
						|
 *	Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
 | 
						|
 *
 | 
						|
 *   This program is free software; you can redistribute it and/or modify
 | 
						|
 *   it under the terms of the GNU General Public License as published by
 | 
						|
 *   the Free Software Foundation; either version 2 of the License, or
 | 
						|
 *   (at your option) any later version.
 | 
						|
 *
 | 
						|
 *   This program is distributed in the hope that it will be useful,
 | 
						|
 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
						|
 *   GNU General Public License for more details.
 | 
						|
 *
 | 
						|
 *   You should have received a copy of the GNU General Public License
 | 
						|
 *   along with this program; if not, write to the Free Software
 | 
						|
 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 | 
						|
 *
 | 
						|
 */      
 | 
						|
 | 
						|
#include <asm/io.h>
 | 
						|
#include <linux/delay.h>
 | 
						|
#include <linux/interrupt.h>
 | 
						|
#include <linux/init.h>
 | 
						|
#include <linux/slab.h>
 | 
						|
#include <sound/core.h>
 | 
						|
 | 
						|
#include "ice1712.h"
 | 
						|
#include "envy24ht.h"
 | 
						|
#include "amp.h"
 | 
						|
 | 
						|
static void wm_put(struct snd_ice1712 *ice, int reg, unsigned short val)
 | 
						|
{
 | 
						|
	unsigned short cval;
 | 
						|
	cval = (reg << 9) | val;
 | 
						|
	snd_vt1724_write_i2c(ice, WM_DEV, cval >> 8, cval & 0xff);
 | 
						|
}
 | 
						|
 | 
						|
static int __devinit snd_vt1724_amp_init(struct snd_ice1712 *ice)
 | 
						|
{
 | 
						|
	static const unsigned short wm_inits[] = {
 | 
						|
		WM_ATTEN_L,	0x0000,	/* 0 db */
 | 
						|
		WM_ATTEN_R,	0x0000,	/* 0 db */
 | 
						|
		WM_DAC_CTRL,	0x0008,	/* 24bit I2S */
 | 
						|
		WM_INT_CTRL,	0x0001, /* 24bit I2S */	
 | 
						|
	};
 | 
						|
 | 
						|
	unsigned int i;
 | 
						|
 | 
						|
	/* only use basic functionality for now */
 | 
						|
 | 
						|
	/* VT1616 6ch codec connected to PSDOUT0 using packed mode */
 | 
						|
	ice->num_total_dacs = 6;
 | 
						|
	ice->num_total_adcs = 2;
 | 
						|
 | 
						|
	/* Chaintech AV-710 has another WM8728 codec connected to PSDOUT4
 | 
						|
	   (shared with the SPDIF output). Mixer control for this codec
 | 
						|
	   is not yet supported. */
 | 
						|
	if (ice->eeprom.subvendor == VT1724_SUBDEVICE_AV710) {
 | 
						|
		for (i = 0; i < ARRAY_SIZE(wm_inits); i += 2)
 | 
						|
			wm_put(ice, wm_inits[i], wm_inits[i+1]);
 | 
						|
	}
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static int __devinit snd_vt1724_amp_add_controls(struct snd_ice1712 *ice)
 | 
						|
{
 | 
						|
	/* we use pins 39 and 41 of the VT1616 for left and right read outputs */
 | 
						|
	snd_ac97_write_cache(ice->ac97, 0x5a, snd_ac97_read(ice->ac97, 0x5a) & ~0x8000);
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/* entry point */
 | 
						|
struct snd_ice1712_card_info snd_vt1724_amp_cards[] __devinitdata = {
 | 
						|
	{
 | 
						|
		.subvendor = VT1724_SUBDEVICE_AV710,
 | 
						|
		.name = "Chaintech AV-710",
 | 
						|
		.model = "av710",
 | 
						|
		.chip_init = snd_vt1724_amp_init,
 | 
						|
		.build_controls = snd_vt1724_amp_add_controls,
 | 
						|
	},
 | 
						|
	{
 | 
						|
		.subvendor = VT1724_SUBDEVICE_AUDIO2000,
 | 
						|
		.name = "AMP Ltd AUDIO2000",
 | 
						|
		.model = "amp2000",
 | 
						|
		.chip_init = snd_vt1724_amp_init,
 | 
						|
		.build_controls = snd_vt1724_amp_add_controls,
 | 
						|
	},
 | 
						|
	{ } /* terminator */
 | 
						|
};
 | 
						|
 |