*** ak4xxx-adda.c	2003-09-12 00:38:26.000000000 -0700
--- ak4xxx-adda.c.orig	2003-07-14 03:29:39.000000000 -0700
***************
*** 84,105 ****
  		/* FIXME: needed for ak4529? */
  		break;
  	case SND_AK4355:
! 		if (state) {
! 			snd_akm4xxx_write(ak, 0, 0x01, 0x02); /* reset and soft-mute */
  			return;
! 		}
! 		for (reg = 0x00; reg < 0x0b; reg++) {
  			if (reg != 0x01)
! 				snd_akm4xxx_write(ak, 0, reg,
! 						snd_akm4xxx_get(ak, 0, reg));
! 		}
! 		snd_akm4xxx_write(ak, 0, 0x01, 0x01); /* un-reset, unmute */
! 		/* and now the other 'RSTN' bits */
! 		snd_akm4xxx_write(ak, 0, 0x00,
! 				snd_akm4xxx_get (ak, 0, 0x00) | 0x01);
! 		snd_akm4xxx_write(ak, 0, 0x02,
! 				snd_akm4xxx_get (ak, 0, 0x02) | 0x01);
! 		/* Needed for the other 2 registers!! */
  		break;
  	case SND_AK4381:
  		for (chip = 0; chip < ak->num_dacs/2; chip++) {
--- 84,95 ----
  		/* FIXME: needed for ak4529? */
  		break;
  	case SND_AK4355:
! 		snd_akm4xxx_write(ak, 0, 0x01, state ? 0x02 : 0x01);
! 		if (state)
  			return;
! 		for (reg = 0x00; reg < 0x0a; reg++)
  			if (reg != 0x01)
! 				snd_akm4xxx_write(ak, 0, reg, snd_akm4xxx_get(ak, 0, reg));
  		break;
  	case SND_AK4381:
  		for (chip = 0; chip < ak->num_dacs/2; chip++) {
***************
*** 161,168 ****
  	static unsigned char inits_ak4355[] = {
  		0x01, 0x02, /* 1: reset and soft-mute */
  		0x00, 0x06, /* 0: mode3(i2s), disable auto-clock detect, disable DZF, sharp roll-off, RSTN#=0 */
! 		0x02, 0x0e, /* 2: DA's power up, normal speed, RSTN#=0 */
! 		// 0x02, 0x2e, /* quad speed */
  		0x03, 0x01, /* 3: de-emphasis off */
  		0x04, 0x00, /* 4: LOUT1 volume muted */
  		0x05, 0x00, /* 5: ROUT1 volume muted */
--- 151,158 ----
  	static unsigned char inits_ak4355[] = {
  		0x01, 0x02, /* 1: reset and soft-mute */
  		0x00, 0x06, /* 0: mode3(i2s), disable auto-clock detect, disable DZF, sharp roll-off, RSTN#=0 */
! 		// 0x02, 0x0e, /* 2: DA's power up, normal speed, RSTN#=0 */
! 		0x02, 0x2e,
  		0x03, 0x01, /* 3: de-emphasis off */
  		0x04, 0x00, /* 4: LOUT1 volume muted */
  		0x05, 0x00, /* 5: ROUT1 volume muted */
***************
*** 172,185 ****
  		0x09, 0x00, /* 9: ROUT3 volume muted */
  		0x0a, 0x00, /* a: DATT speed=0, ignore DZF */
  		0x01, 0x01, /* 1: un-reset, unmute */
- 		0x00, 0x07, /* 0: above plus RSTN<-1 */
- 		0x02, 0x0f, /* 2: above plus RSTN<-1 */
  		0xff, 0xff
  	};
  	static unsigned char inits_ak4381[] = {
  		0x00, 0x0c, /* 0: mode3(i2s), disable auto-clock detect */
! 		0x01, 0x02, /* 1: de-emphasis off, normal speed, sharp roll-off, DZF off */
! 		// 0x01, 0x12, /* quad speed */
  		0x02, 0x00, /* 2: DZF disabled */
  		0x03, 0x00, /* 3: LATT 0 */
  		0x04, 0x00, /* 4: RATT 0 */
--- 162,173 ----
  		0x09, 0x00, /* 9: ROUT3 volume muted */
  		0x0a, 0x00, /* a: DATT speed=0, ignore DZF */
  		0x01, 0x01, /* 1: un-reset, unmute */
  		0xff, 0xff
  	};
  	static unsigned char inits_ak4381[] = {
  		0x00, 0x0c, /* 0: mode3(i2s), disable auto-clock detect */
! 		// 0x01, 0x02, /* 1: de-emphasis off, normal speed, sharp roll-off, DZF off */
! 		0x01, 0x12,
  		0x02, 0x00, /* 2: DZF disabled */
  		0x03, 0x00, /* 3: LATT 0 */
  		0x04, 0x00, /* 4: RATT 0 */
***************
*** 352,358 ****
  
  int snd_akm4xxx_build_controls(akm4xxx_t *ak)
  {
! 	unsigned int idx, num_emphs;
  	int err;
  
  	for (idx = 0; idx < ak->num_dacs; ++idx) {
--- 340,346 ----
  
  int snd_akm4xxx_build_controls(akm4xxx_t *ak)
  {
! 	unsigned int idx;
  	int err;
  
  	for (idx = 0; idx < ak->num_dacs; ++idx) {
***************
*** 394,400 ****
  		snd_kcontrol_t ctl;
  		memset(&ctl, 0, sizeof(ctl));
  		strcpy(ctl.id.name, "ADC Volume");
! 		ctl.id.index = idx + ak->idx_offset * 2;
  		ctl.id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
  		ctl.count = 1;
  		ctl.info = snd_akm4xxx_volume_info;
--- 382,388 ----
  		snd_kcontrol_t ctl;
  		memset(&ctl, 0, sizeof(ctl));
  		strcpy(ctl.id.name, "ADC Volume");
! 		ctl.id.index = idx;
  		ctl.id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
  		ctl.count = 1;
  		ctl.info = snd_akm4xxx_volume_info;
***************
*** 406,412 ****
  			return err;
  		memset(&ctl, 0, sizeof(ctl));
  		strcpy(ctl.id.name, "IPGA Analog Capture Volume");
! 		ctl.id.index = idx + ak->idx_offset * 2;
  		ctl.id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
  		ctl.count = 1;
  		ctl.info = snd_akm4xxx_ipga_gain_info;
--- 394,400 ----
  			return err;
  		memset(&ctl, 0, sizeof(ctl));
  		strcpy(ctl.id.name, "IPGA Analog Capture Volume");
! 		ctl.id.index = idx;
  		ctl.id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
  		ctl.count = 1;
  		ctl.info = snd_akm4xxx_ipga_gain_info;
***************
*** 417,427 ****
  		if ((err = snd_ctl_add(ak->card, snd_ctl_new(&ctl, SNDRV_CTL_ELEM_ACCESS_READ|SNDRV_CTL_ELEM_ACCESS_WRITE))) < 0)
  			return err;
  	}
! 	if (ak->type == SND_AK4355)
! 		num_emphs = 1;
! 	else
! 		num_emphs = ak->num_dacs / 2;
! 	for (idx = 0; idx < num_emphs; idx++) {
  		snd_kcontrol_t ctl;
  		memset(&ctl, 0, sizeof(ctl));
  		strcpy(ctl.id.name, "Deemphasis");
--- 405,411 ----
  		if ((err = snd_ctl_add(ak->card, snd_ctl_new(&ctl, SNDRV_CTL_ELEM_ACCESS_READ|SNDRV_CTL_ELEM_ACCESS_WRITE))) < 0)
  			return err;
  	}
! 	for (idx = 0; idx < ak->num_dacs/2; idx++) {
  		snd_kcontrol_t ctl;
  		memset(&ctl, 0, sizeof(ctl));
  		strcpy(ctl.id.name, "Deemphasis");