Moved, renamed, and deleted files

The original directory structure was scattered and unorganized.
Changes are basically to make it look like kernel structure.

1 files changed, 0 insertions, 1089 deletions

diff --git a/ANDROID_3.4.5/sound/isa/cs423x/cs4236_lib.c b/ANDROID_3.4.5/sound/isa/cs423x/cs4236_lib.c
deleted file mode 100644
index c5adca30..00000000
--- a/ANDROID_3.4.5/sound/isa/cs423x/cs4236_lib.c
+++ /dev/null
@@ -1,1089 +0,0 @@
-/*
- *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
- *  Routines for control of CS4235/4236B/4237B/4238B/4239 chips
- *
- *  Note:
- *     -----
- *
- *  Bugs:
- *     -----
- *
- *   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
- *
- */
-
-/*
- *  Indirect control registers (CS4236B+)
- * 
- *  C0
- *     D8: WSS reset (all chips)
- *
- *  C1 (all chips except CS4236)
- *     D7-D5: version 
- *     D4-D0: chip id
- *             11101 - CS4235
- *             01011 - CS4236B
- *             01000 - CS4237B
- *             01001 - CS4238B
- *             11110 - CS4239
- *
- *  C2
- *     D7-D4: 3D Space (CS4235,CS4237B,CS4238B,CS4239)
- *     D3-D0: 3D Center (CS4237B); 3D Volume (CS4238B)
- * 
- *  C3
- *     D7: 3D Enable (CS4237B)
- *     D6: 3D Mono Enable (CS4237B)
- *     D5: 3D Serial Output (CS4237B,CS4238B)
- *     D4: 3D Enable (CS4235,CS4238B,CS4239)
- *
- *  C4
- *     D7: consumer serial port enable (CS4237B,CS4238B)
- *     D6: channels status block reset (CS4237B,CS4238B)
- *     D5: user bit in sub-frame of digital audio data (CS4237B,CS4238B)
- *     D4: validity bit bit in sub-frame of digital audio data (CS4237B,CS4238B)
- * 
- *  C5  lower channel status (digital serial data description) (CS4237B,CS4238B)
- *     D7-D6: first two bits of category code
- *     D5: lock
- *     D4-D3: pre-emphasis (0 = none, 1 = 50/15us)
- *     D2: copy/copyright (0 = copy inhibited)
- *     D1: 0 = digital audio / 1 = non-digital audio
- *     
- *  C6  upper channel status (digital serial data description) (CS4237B,CS4238B)
- *     D7-D6: sample frequency (0 = 44.1kHz)
- *     D5: generation status (0 = no indication, 1 = original/commercially precaptureed data)
- *     D4-D0: category code (upper bits)
- *
- *  C7  reserved (must write 0)
- *
- *  C8  wavetable control
- *     D7: volume control interrupt enable (CS4235,CS4239)
- *     D6: hardware volume control format (CS4235,CS4239)
- *     D3: wavetable serial port enable (all chips)
- *     D2: DSP serial port switch (all chips)
- *     D1: disable MCLK (all chips)
- *     D0: force BRESET low (all chips)
- *
- */
-
-#include <asm/io.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/time.h>
-#include <linux/wait.h>
-#include <sound/core.h>
-#include <sound/wss.h>
-#include <sound/asoundef.h>
-#include <sound/initval.h>
-#include <sound/tlv.h>
-
-/*
- *
- */
-
-static unsigned char snd_cs4236_ext_map[18] = {
-	/* CS4236_LEFT_LINE */		0xff,
-	/* CS4236_RIGHT_LINE */		0xff,
-	/* CS4236_LEFT_MIC */		0xdf,
-	/* CS4236_RIGHT_MIC */		0xdf,
-	/* CS4236_LEFT_MIX_CTRL */	0xe0 | 0x18,
-	/* CS4236_RIGHT_MIX_CTRL */	0xe0,
-	/* CS4236_LEFT_FM */		0xbf,
-	/* CS4236_RIGHT_FM */		0xbf,
-	/* CS4236_LEFT_DSP */		0xbf,
-	/* CS4236_RIGHT_DSP */		0xbf,
-	/* CS4236_RIGHT_LOOPBACK */	0xbf,
-	/* CS4236_DAC_MUTE */		0xe0,
-	/* CS4236_ADC_RATE */		0x01,	/* 48kHz */
-	/* CS4236_DAC_RATE */		0x01,	/* 48kHz */
-	/* CS4236_LEFT_MASTER */	0xbf,
-	/* CS4236_RIGHT_MASTER */	0xbf,
-	/* CS4236_LEFT_WAVE */		0xbf,
-	/* CS4236_RIGHT_WAVE */		0xbf
-};
-
-/*
- *
- */
-
-static void snd_cs4236_ctrl_out(struct snd_wss *chip,
-				unsigned char reg, unsigned char val)
-{
-	outb(reg, chip->cport + 3);
-	outb(chip->cimage[reg] = val, chip->cport + 4);
-}
-
-static unsigned char snd_cs4236_ctrl_in(struct snd_wss *chip, unsigned char reg)
-{
-	outb(reg, chip->cport + 3);
-	return inb(chip->cport + 4);
-}
-
-/*
- *  PCM
- */
-
-#define CLOCKS 8
-
-static struct snd_ratnum clocks[CLOCKS] = {
-	{ .num = 16934400, .den_min = 353, .den_max = 353, .den_step = 1 },
-	{ .num = 16934400, .den_min = 529, .den_max = 529, .den_step = 1 },
-	{ .num = 16934400, .den_min = 617, .den_max = 617, .den_step = 1 },
-	{ .num = 16934400, .den_min = 1058, .den_max = 1058, .den_step = 1 },
-	{ .num = 16934400, .den_min = 1764, .den_max = 1764, .den_step = 1 },
-	{ .num = 16934400, .den_min = 2117, .den_max = 2117, .den_step = 1 },
-	{ .num = 16934400, .den_min = 2558, .den_max = 2558, .den_step = 1 },
-	{ .num = 16934400/16, .den_min = 21, .den_max = 192, .den_step = 1 }
-};
-
-static struct snd_pcm_hw_constraint_ratnums hw_constraints_clocks = {
-	.nrats = CLOCKS,
-	.rats = clocks,
-};
-
-static int snd_cs4236_xrate(struct snd_pcm_runtime *runtime)
-{
-	return snd_pcm_hw_constraint_ratnums(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
-					     &hw_constraints_clocks);
-}
-
-static unsigned char divisor_to_rate_register(unsigned int divisor)
-{
-	switch (divisor) {
-	case 353:	return 1;
-	case 529:	return 2;
-	case 617:	return 3;
-	case 1058:	return 4;
-	case 1764:	return 5;
-	case 2117:	return 6;
-	case 2558:	return 7;
-	default:
-		if (divisor < 21 || divisor > 192) {
-			snd_BUG();
-			return 192;
-		}
-		return divisor;
-	}
-}
-
-static void snd_cs4236_playback_format(struct snd_wss *chip,
-				       struct snd_pcm_hw_params *params,
-				       unsigned char pdfr)
-{
-	unsigned long flags;
-	unsigned char rate = divisor_to_rate_register(params->rate_den);
-	
-	spin_lock_irqsave(&chip->reg_lock, flags);
-	/* set fast playback format change and clean playback FIFO */
-	snd_wss_out(chip, CS4231_ALT_FEATURE_1,
-		    chip->image[CS4231_ALT_FEATURE_1] | 0x10);
-	snd_wss_out(chip, CS4231_PLAYBK_FORMAT, pdfr & 0xf0);
-	snd_wss_out(chip, CS4231_ALT_FEATURE_1,
-		    chip->image[CS4231_ALT_FEATURE_1] & ~0x10);
-	snd_cs4236_ext_out(chip, CS4236_DAC_RATE, rate);
-	spin_unlock_irqrestore(&chip->reg_lock, flags);
-}
-
-static void snd_cs4236_capture_format(struct snd_wss *chip,
-				      struct snd_pcm_hw_params *params,
-				      unsigned char cdfr)
-{
-	unsigned long flags;
-	unsigned char rate = divisor_to_rate_register(params->rate_den);
-	
-	spin_lock_irqsave(&chip->reg_lock, flags);
-	/* set fast capture format change and clean capture FIFO */
-	snd_wss_out(chip, CS4231_ALT_FEATURE_1,
-		    chip->image[CS4231_ALT_FEATURE_1] | 0x20);
-	snd_wss_out(chip, CS4231_REC_FORMAT, cdfr & 0xf0);
-	snd_wss_out(chip, CS4231_ALT_FEATURE_1,
-		    chip->image[CS4231_ALT_FEATURE_1] & ~0x20);
-	snd_cs4236_ext_out(chip, CS4236_ADC_RATE, rate);
-	spin_unlock_irqrestore(&chip->reg_lock, flags);
-}
-
-#ifdef CONFIG_PM
-
-static void snd_cs4236_suspend(struct snd_wss *chip)
-{
-	int reg;
-	unsigned long flags;
-	
-	spin_lock_irqsave(&chip->reg_lock, flags);
-	for (reg = 0; reg < 32; reg++)
-		chip->image[reg] = snd_wss_in(chip, reg);
-	for (reg = 0; reg < 18; reg++)
-		chip->eimage[reg] = snd_cs4236_ext_in(chip, CS4236_I23VAL(reg));
-	for (reg = 2; reg < 9; reg++)
-		chip->cimage[reg] = snd_cs4236_ctrl_in(chip, reg);
-	spin_unlock_irqrestore(&chip->reg_lock, flags);
-}
-
-static void snd_cs4236_resume(struct snd_wss *chip)
-{
-	int reg;
-	unsigned long flags;
-	
-	snd_wss_mce_up(chip);
-	spin_lock_irqsave(&chip->reg_lock, flags);
-	for (reg = 0; reg < 32; reg++) {
-		switch (reg) {
-		case CS4236_EXT_REG:
-		case CS4231_VERSION:
-		case 27:	/* why? CS4235 - master left */
-		case 29:	/* why? CS4235 - master right */
-			break;
-		default:
-			snd_wss_out(chip, reg, chip->image[reg]);
-			break;
-		}
-	}
-	for (reg = 0; reg < 18; reg++)
-		snd_cs4236_ext_out(chip, CS4236_I23VAL(reg), chip->eimage[reg]);
-	for (reg = 2; reg < 9; reg++) {
-		switch (reg) {
-		case 7:
-			break;
-		default:
-			snd_cs4236_ctrl_out(chip, reg, chip->cimage[reg]);
-		}
-	}
-	spin_unlock_irqrestore(&chip->reg_lock, flags);
-	snd_wss_mce_down(chip);
-}
-
-#endif /* CONFIG_PM */
-/*
- * This function does no fail if the chip is not CS4236B or compatible.
- * It just an equivalent to the snd_wss_create() then.
- */
-int snd_cs4236_create(struct snd_card *card,
-		      unsigned long port,
-		      unsigned long cport,
-		      int irq, int dma1, int dma2,
-		      unsigned short hardware,
-		      unsigned short hwshare,
-		      struct snd_wss **rchip)
-{
-	struct snd_wss *chip;
-	unsigned char ver1, ver2;
-	unsigned int reg;
-	int err;
-
-	*rchip = NULL;
-	if (hardware == WSS_HW_DETECT)
-		hardware = WSS_HW_DETECT3;
-
-	err = snd_wss_create(card, port, cport,
-			     irq, dma1, dma2, hardware, hwshare, &chip);
-	if (err < 0)
-		return err;
-
-	if ((chip->hardware & WSS_HW_CS4236B_MASK) == 0) {
-		snd_printd("chip is not CS4236+, hardware=0x%x\n",
-			   chip->hardware);
-		*rchip = chip;
-		return 0;
-	}
-#if 0
-	{
-		int idx;
-		for (idx = 0; idx < 8; idx++)
-			snd_printk(KERN_DEBUG "CD%i = 0x%x\n",
-				   idx, inb(chip->cport + idx));
-		for (idx = 0; idx < 9; idx++)
-			snd_printk(KERN_DEBUG "C%i = 0x%x\n",
-				   idx, snd_cs4236_ctrl_in(chip, idx));
-	}
-#endif
-	if (cport < 0x100 || cport == SNDRV_AUTO_PORT) {
-		snd_printk(KERN_ERR "please, specify control port "
-			   "for CS4236+ chips\n");
-		snd_device_free(card, chip);
-		return -ENODEV;
-	}
-	ver1 = snd_cs4236_ctrl_in(chip, 1);
-	ver2 = snd_cs4236_ext_in(chip, CS4236_VERSION);
-	snd_printdd("CS4236: [0x%lx] C1 (version) = 0x%x, ext = 0x%x\n",
-			cport, ver1, ver2);
-	if (ver1 != ver2) {
-		snd_printk(KERN_ERR "CS4236+ chip detected, but "
-			   "control port 0x%lx is not valid\n", cport);
-		snd_device_free(card, chip);
-		return -ENODEV;
-	}
-	snd_cs4236_ctrl_out(chip, 0, 0x00);
-	snd_cs4236_ctrl_out(chip, 2, 0xff);
-	snd_cs4236_ctrl_out(chip, 3, 0x00);
-	snd_cs4236_ctrl_out(chip, 4, 0x80);
-	reg = ((IEC958_AES1_CON_PCM_CODER & 3) << 6) |
-	      IEC958_AES0_CON_EMPHASIS_NONE;
-	snd_cs4236_ctrl_out(chip, 5, reg);
-	snd_cs4236_ctrl_out(chip, 6, IEC958_AES1_CON_PCM_CODER >> 2);
-	snd_cs4236_ctrl_out(chip, 7, 0x00);
-	/*
-	 * 0x8c for C8 is valid for Turtle Beach Malibu - the IEC-958
-	 * output is working with this setup, other hardware should
-	 * have different signal paths and this value should be
-	 * selectable in the future
-	 */
-	snd_cs4236_ctrl_out(chip, 8, 0x8c);
-	chip->rate_constraint = snd_cs4236_xrate;
-	chip->set_playback_format = snd_cs4236_playback_format;
-	chip->set_capture_format = snd_cs4236_capture_format;
-#ifdef CONFIG_PM
-	chip->suspend = snd_cs4236_suspend;
-	chip->resume = snd_cs4236_resume;
-#endif
-
-	/* initialize extended registers */
-	for (reg = 0; reg < sizeof(snd_cs4236_ext_map); reg++)
-		snd_cs4236_ext_out(chip, CS4236_I23VAL(reg),
-				   snd_cs4236_ext_map[reg]);
-
-	/* initialize compatible but more featured registers */
-	snd_wss_out(chip, CS4231_LEFT_INPUT, 0x40);
-	snd_wss_out(chip, CS4231_RIGHT_INPUT, 0x40);
-	snd_wss_out(chip, CS4231_AUX1_LEFT_INPUT, 0xff);
-	snd_wss_out(chip, CS4231_AUX1_RIGHT_INPUT, 0xff);
-	snd_wss_out(chip, CS4231_AUX2_LEFT_INPUT, 0xdf);
-	snd_wss_out(chip, CS4231_AUX2_RIGHT_INPUT, 0xdf);
-	snd_wss_out(chip, CS4231_RIGHT_LINE_IN, 0xff);
-	snd_wss_out(chip, CS4231_LEFT_LINE_IN, 0xff);
-	snd_wss_out(chip, CS4231_RIGHT_LINE_IN, 0xff);
-	switch (chip->hardware) {
-	case WSS_HW_CS4235:
-	case WSS_HW_CS4239:
-		snd_wss_out(chip, CS4235_LEFT_MASTER, 0xff);
-		snd_wss_out(chip, CS4235_RIGHT_MASTER, 0xff);
-		break;
-	}
-
-	*rchip = chip;
-	return 0;
-}
-
-int snd_cs4236_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm)
-{
-	struct snd_pcm *pcm;
-	int err;
-	
-	err = snd_wss_pcm(chip, device, &pcm);
-	if (err < 0)
-		return err;
-	pcm->info_flags &= ~SNDRV_PCM_INFO_JOINT_DUPLEX;
-	if (rpcm)
-		*rpcm = pcm;
-	return 0;
-}
-
-/*
- *  MIXER
- */
-
-#define CS4236_SINGLE(xname, xindex, reg, shift, mask, invert) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
-  .info = snd_cs4236_info_single, \
-  .get = snd_cs4236_get_single, .put = snd_cs4236_put_single, \
-  .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) }
-
-#define CS4236_SINGLE_TLV(xname, xindex, reg, shift, mask, invert, xtlv) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
-  .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ, \
-  .info = snd_cs4236_info_single, \
-  .get = snd_cs4236_get_single, .put = snd_cs4236_put_single, \
-  .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24), \
-  .tlv = { .p = (xtlv) } }
-
-static int snd_cs4236_info_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-	int mask = (kcontrol->private_value >> 16) & 0xff;
-
-	uinfo->type = mask == 1 ? SNDRV_CTL_ELEM_TYPE_BOOLEAN : SNDRV_CTL_ELEM_TYPE_INTEGER;
-	uinfo->count = 1;
-	uinfo->value.integer.min = 0;
-	uinfo->value.integer.max = mask;
-	return 0;
-}
-
-static int snd_cs4236_get_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);
-	unsigned long flags;
-	int reg = kcontrol->private_value & 0xff;
-	int shift = (kcontrol->private_value >> 8) & 0xff;
-	int mask = (kcontrol->private_value >> 16) & 0xff;
-	int invert = (kcontrol->private_value >> 24) & 0xff;
-	
-	spin_lock_irqsave(&chip->reg_lock, flags);
-	ucontrol->value.integer.value[0] = (chip->eimage[CS4236_REG(reg)] >> shift) & mask;
-	spin_unlock_irqrestore(&chip->reg_lock, flags);
-	if (invert)
-		ucontrol->value.integer.value[0] = mask - ucontrol->value.integer.value[0];
-	return 0;
-}
-
-static int snd_cs4236_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);
-	unsigned long flags;
-	int reg = kcontrol->private_value & 0xff;
-	int shift = (kcontrol->private_value >> 8) & 0xff;
-	int mask = (kcontrol->private_value >> 16) & 0xff;
-	int invert = (kcontrol->private_value >> 24) & 0xff;
-	int change;
-	unsigned short val;
-	
-	val = (ucontrol->value.integer.value[0] & mask);
-	if (invert)
-		val = mask - val;
-	val <<= shift;
-	spin_lock_irqsave(&chip->reg_lock, flags);
-	val = (chip->eimage[CS4236_REG(reg)] & ~(mask << shift)) | val;
-	change = val != chip->eimage[CS4236_REG(reg)];
-	snd_cs4236_ext_out(chip, reg, val);
-	spin_unlock_irqrestore(&chip->reg_lock, flags);
-	return change;
-}
-
-#define CS4236_SINGLEC(xname, xindex, reg, shift, mask, invert) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
-  .info = snd_cs4236_info_single, \
-  .get = snd_cs4236_get_singlec, .put = snd_cs4236_put_singlec, \
-  .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) }
-
-static int snd_cs4236_get_singlec(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);
-	unsigned long flags;
-	int reg = kcontrol->private_value & 0xff;
-	int shift = (kcontrol->private_value >> 8) & 0xff;
-	int mask = (kcontrol->private_value >> 16) & 0xff;
-	int invert = (kcontrol->private_value >> 24) & 0xff;
-	
-	spin_lock_irqsave(&chip->reg_lock, flags);
-	ucontrol->value.integer.value[0] = (chip->cimage[reg] >> shift) & mask;
-	spin_unlock_irqrestore(&chip->reg_lock, flags);
-	if (invert)
-		ucontrol->value.integer.value[0] = mask - ucontrol->value.integer.value[0];
-	return 0;
-}
-
-static int snd_cs4236_put_singlec(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);
-	unsigned long flags;
-	int reg = kcontrol->private_value & 0xff;
-	int shift = (kcontrol->private_value >> 8) & 0xff;
-	int mask = (kcontrol->private_value >> 16) & 0xff;
-	int invert = (kcontrol->private_value >> 24) & 0xff;
-	int change;
-	unsigned short val;
-	
-	val = (ucontrol->value.integer.value[0] & mask);
-	if (invert)
-		val = mask - val;
-	val <<= shift;
-	spin_lock_irqsave(&chip->reg_lock, flags);
-	val = (chip->cimage[reg] & ~(mask << shift)) | val;
-	change = val != chip->cimage[reg];
-	snd_cs4236_ctrl_out(chip, reg, val);
-	spin_unlock_irqrestore(&chip->reg_lock, flags);
-	return change;
-}
-
-#define CS4236_DOUBLE(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
-  .info = snd_cs4236_info_double, \
-  .get = snd_cs4236_get_double, .put = snd_cs4236_put_double, \
-  .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }
-
-#define CS4236_DOUBLE_TLV(xname, xindex, left_reg, right_reg, shift_left, \
-			  shift_right, mask, invert, xtlv) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
-  .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ, \
-  .info = snd_cs4236_info_double, \
-  .get = snd_cs4236_get_double, .put = snd_cs4236_put_double, \
-  .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | \
-		   (shift_right << 19) | (mask << 24) | (invert << 22), \
-  .tlv = { .p = (xtlv) } }
-
-static int snd_cs4236_info_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-	int mask = (kcontrol->private_value >> 24) & 0xff;
-
-	uinfo->type = mask == 1 ? SNDRV_CTL_ELEM_TYPE_BOOLEAN : SNDRV_CTL_ELEM_TYPE_INTEGER;
-	uinfo->count = 2;
-	uinfo->value.integer.min = 0;
-	uinfo->value.integer.max = mask;
-	return 0;
-}
-
-static int snd_cs4236_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);
-	unsigned long flags;
-	int left_reg = kcontrol->private_value & 0xff;
-	int right_reg = (kcontrol->private_value >> 8) & 0xff;
-	int shift_left = (kcontrol->private_value >> 16) & 0x07;
-	int shift_right = (kcontrol->private_value >> 19) & 0x07;
-	int mask = (kcontrol->private_value >> 24) & 0xff;
-	int invert = (kcontrol->private_value >> 22) & 1;
-	
-	spin_lock_irqsave(&chip->reg_lock, flags);
-	ucontrol->value.integer.value[0] = (chip->eimage[CS4236_REG(left_reg)] >> shift_left) & mask;
-	ucontrol->value.integer.value[1] = (chip->eimage[CS4236_REG(right_reg)] >> shift_right) & mask;
-	spin_unlock_irqrestore(&chip->reg_lock, flags);
-	if (invert) {
-		ucontrol->value.integer.value[0] = mask - ucontrol->value.integer.value[0];
-		ucontrol->value.integer.value[1] = mask - ucontrol->value.integer.value[1];
-	}
-	return 0;
-}
-
-static int snd_cs4236_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);
-	unsigned long flags;
-	int left_reg = kcontrol->private_value & 0xff;
-	int right_reg = (kcontrol->private_value >> 8) & 0xff;
-	int shift_left = (kcontrol->private_value >> 16) & 0x07;
-	int shift_right = (kcontrol->private_value >> 19) & 0x07;
-	int mask = (kcontrol->private_value >> 24) & 0xff;
-	int invert = (kcontrol->private_value >> 22) & 1;
-	int change;
-	unsigned short val1, val2;
-	
-	val1 = ucontrol->value.integer.value[0] & mask;
-	val2 = ucontrol->value.integer.value[1] & mask;
-	if (invert) {
-		val1 = mask - val1;
-		val2 = mask - val2;
-	}
-	val1 <<= shift_left;
-	val2 <<= shift_right;
-	spin_lock_irqsave(&chip->reg_lock, flags);
-	if (left_reg != right_reg) {
-		val1 = (chip->eimage[CS4236_REG(left_reg)] & ~(mask << shift_left)) | val1;
-		val2 = (chip->eimage[CS4236_REG(right_reg)] & ~(mask << shift_right)) | val2;
-		change = val1 != chip->eimage[CS4236_REG(left_reg)] || val2 != chip->eimage[CS4236_REG(right_reg)];
-		snd_cs4236_ext_out(chip, left_reg, val1);
-		snd_cs4236_ext_out(chip, right_reg, val2);
-	} else {
-		val1 = (chip->eimage[CS4236_REG(left_reg)] & ~((mask << shift_left) | (mask << shift_right))) | val1 | val2;
-		change = val1 != chip->eimage[CS4236_REG(left_reg)];
-		snd_cs4236_ext_out(chip, left_reg, val1);
-	}
-	spin_unlock_irqrestore(&chip->reg_lock, flags);
-	return change;
-}
-
-#define CS4236_DOUBLE1(xname, xindex, left_reg, right_reg, shift_left, \
-			shift_right, mask, invert) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
-  .info = snd_cs4236_info_double, \
-  .get = snd_cs4236_get_double1, .put = snd_cs4236_put_double1, \
-  .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }
-
-#define CS4236_DOUBLE1_TLV(xname, xindex, left_reg, right_reg, shift_left, \
-			   shift_right, mask, invert, xtlv) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
-  .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ, \
-  .info = snd_cs4236_info_double, \
-  .get = snd_cs4236_get_double1, .put = snd_cs4236_put_double1, \
-  .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | \
-		   (shift_right << 19) | (mask << 24) | (invert << 22), \
-  .tlv = { .p = (xtlv) } }
-
-static int snd_cs4236_get_double1(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);
-	unsigned long flags;
-	int left_reg = kcontrol->private_value & 0xff;
-	int right_reg = (kcontrol->private_value >> 8) & 0xff;
-	int shift_left = (kcontrol->private_value >> 16) & 0x07;
-	int shift_right = (kcontrol->private_value >> 19) & 0x07;
-	int mask = (kcontrol->private_value >> 24) & 0xff;
-	int invert = (kcontrol->private_value >> 22) & 1;
-	
-	spin_lock_irqsave(&chip->reg_lock, flags);
-	ucontrol->value.integer.value[0] = (chip->image[left_reg] >> shift_left) & mask;
-	ucontrol->value.integer.value[1] = (chip->eimage[CS4236_REG(right_reg)] >> shift_right) & mask;
-	spin_unlock_irqrestore(&chip->reg_lock, flags);
-	if (invert) {
-		ucontrol->value.integer.value[0] = mask - ucontrol->value.integer.value[0];
-		ucontrol->value.integer.value[1] = mask - ucontrol->value.integer.value[1];
-	}
-	return 0;
-}
-
-static int snd_cs4236_put_double1(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);
-	unsigned long flags;
-	int left_reg = kcontrol->private_value & 0xff;
-	int right_reg = (kcontrol->private_value >> 8) & 0xff;
-	int shift_left = (kcontrol->private_value >> 16) & 0x07;
-	int shift_right = (kcontrol->private_value >> 19) & 0x07;
-	int mask = (kcontrol->private_value >> 24) & 0xff;
-	int invert = (kcontrol->private_value >> 22) & 1;
-	int change;
-	unsigned short val1, val2;
-	
-	val1 = ucontrol->value.integer.value[0] & mask;
-	val2 = ucontrol->value.integer.value[1] & mask;
-	if (invert) {
-		val1 = mask - val1;
-		val2 = mask - val2;
-	}
-	val1 <<= shift_left;
-	val2 <<= shift_right;
-	spin_lock_irqsave(&chip->reg_lock, flags);
-	val1 = (chip->image[left_reg] & ~(mask << shift_left)) | val1;
-	val2 = (chip->eimage[CS4236_REG(right_reg)] & ~(mask << shift_right)) | val2;
-	change = val1 != chip->image[left_reg] || val2 != chip->eimage[CS4236_REG(right_reg)];
-	snd_wss_out(chip, left_reg, val1);
-	snd_cs4236_ext_out(chip, right_reg, val2);
-	spin_unlock_irqrestore(&chip->reg_lock, flags);
-	return change;
-}
-
-#define CS4236_MASTER_DIGITAL(xname, xindex, xtlv) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
-  .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ, \
-  .info = snd_cs4236_info_double, \
-  .get = snd_cs4236_get_master_digital, .put = snd_cs4236_put_master_digital, \
-  .private_value = 71 << 24, \
-  .tlv = { .p = (xtlv) } }
-
-static inline int snd_cs4236_mixer_master_digital_invert_volume(int vol)
-{
-	return (vol < 64) ? 63 - vol : 64 + (71 - vol);
-}
-
-static int snd_cs4236_get_master_digital(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);
-	unsigned long flags;
-	
-	spin_lock_irqsave(&chip->reg_lock, flags);
-	ucontrol->value.integer.value[0] = snd_cs4236_mixer_master_digital_invert_volume(chip->eimage[CS4236_REG(CS4236_LEFT_MASTER)] & 0x7f);
-	ucontrol->value.integer.value[1] = snd_cs4236_mixer_master_digital_invert_volume(chip->eimage[CS4236_REG(CS4236_RIGHT_MASTER)] & 0x7f);
-	spin_unlock_irqrestore(&chip->reg_lock, flags);
-	return 0;
-}
-
-static int snd_cs4236_put_master_digital(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);
-	unsigned long flags;
-	int change;
-	unsigned short val1, val2;
-	
-	val1 = snd_cs4236_mixer_master_digital_invert_volume(ucontrol->value.integer.value[0] & 0x7f);
-	val2 = snd_cs4236_mixer_master_digital_invert_volume(ucontrol->value.integer.value[1] & 0x7f);
-	spin_lock_irqsave(&chip->reg_lock, flags);
-	val1 = (chip->eimage[CS4236_REG(CS4236_LEFT_MASTER)] & ~0x7f) | val1;
-	val2 = (chip->eimage[CS4236_REG(CS4236_RIGHT_MASTER)] & ~0x7f) | val2;
-	change = val1 != chip->eimage[CS4236_REG(CS4236_LEFT_MASTER)] || val2 != chip->eimage[CS4236_REG(CS4236_RIGHT_MASTER)];
-	snd_cs4236_ext_out(chip, CS4236_LEFT_MASTER, val1);
-	snd_cs4236_ext_out(chip, CS4236_RIGHT_MASTER, val2);
-	spin_unlock_irqrestore(&chip->reg_lock, flags);
-	return change;
-}
-
-#define CS4235_OUTPUT_ACCU(xname, xindex, xtlv) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
-  .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ, \
-  .info = snd_cs4236_info_double, \
-  .get = snd_cs4235_get_output_accu, .put = snd_cs4235_put_output_accu, \
-  .private_value = 3 << 24, \
-  .tlv = { .p = (xtlv) } }
-
-static inline int snd_cs4235_mixer_output_accu_get_volume(int vol)
-{
-	switch ((vol >> 5) & 3) {
-	case 0: return 1;
-	case 1: return 3;
-	case 2: return 2;
-	case 3: return 0;
- 	}
-	return 3;
-}
-
-static inline int snd_cs4235_mixer_output_accu_set_volume(int vol)
-{
-	switch (vol & 3) {
-	case 0: return 3 << 5;
-	case 1: return 0 << 5;
-	case 2: return 2 << 5;
-	case 3: return 1 << 5;
-	}
-	return 1 << 5;
-}
-
-static int snd_cs4235_get_output_accu(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);
-	unsigned long flags;
-	
-	spin_lock_irqsave(&chip->reg_lock, flags);
-	ucontrol->value.integer.value[0] = snd_cs4235_mixer_output_accu_get_volume(chip->image[CS4235_LEFT_MASTER]);
-	ucontrol->value.integer.value[1] = snd_cs4235_mixer_output_accu_get_volume(chip->image[CS4235_RIGHT_MASTER]);
-	spin_unlock_irqrestore(&chip->reg_lock, flags);
-	return 0;
-}
-
-static int snd_cs4235_put_output_accu(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);
-	unsigned long flags;
-	int change;
-	unsigned short val1, val2;
-	
-	val1 = snd_cs4235_mixer_output_accu_set_volume(ucontrol->value.integer.value[0]);
-	val2 = snd_cs4235_mixer_output_accu_set_volume(ucontrol->value.integer.value[1]);
-	spin_lock_irqsave(&chip->reg_lock, flags);
-	val1 = (chip->image[CS4235_LEFT_MASTER] & ~(3 << 5)) | val1;
-	val2 = (chip->image[CS4235_RIGHT_MASTER] & ~(3 << 5)) | val2;
-	change = val1 != chip->image[CS4235_LEFT_MASTER] || val2 != chip->image[CS4235_RIGHT_MASTER];
-	snd_wss_out(chip, CS4235_LEFT_MASTER, val1);
-	snd_wss_out(chip, CS4235_RIGHT_MASTER, val2);
-	spin_unlock_irqrestore(&chip->reg_lock, flags);
-	return change;
-}
-
-static const DECLARE_TLV_DB_SCALE(db_scale_7bit, -9450, 150, 0);
-static const DECLARE_TLV_DB_SCALE(db_scale_6bit, -9450, 150, 0);
-static const DECLARE_TLV_DB_SCALE(db_scale_6bit_12db_max, -8250, 150, 0);
-static const DECLARE_TLV_DB_SCALE(db_scale_5bit_12db_max, -3450, 150, 0);
-static const DECLARE_TLV_DB_SCALE(db_scale_5bit_22db_max, -2400, 150, 0);
-static const DECLARE_TLV_DB_SCALE(db_scale_4bit, -4500, 300, 0);
-static const DECLARE_TLV_DB_SCALE(db_scale_2bit, -1800, 600, 0);
-static const DECLARE_TLV_DB_SCALE(db_scale_rec_gain, 0, 150, 0);
-
-static struct snd_kcontrol_new snd_cs4236_controls[] = {
-
-CS4236_DOUBLE("Master Digital Playback Switch", 0,
-		CS4236_LEFT_MASTER, CS4236_RIGHT_MASTER, 7, 7, 1, 1),
-CS4236_DOUBLE("Master Digital Capture Switch", 0,
-		CS4236_DAC_MUTE, CS4236_DAC_MUTE, 7, 6, 1, 1),
-CS4236_MASTER_DIGITAL("Master Digital Volume", 0, db_scale_7bit),
-
-CS4236_DOUBLE_TLV("Capture Boost Volume", 0,
-		  CS4236_LEFT_MIX_CTRL, CS4236_RIGHT_MIX_CTRL, 5, 5, 3, 1,
-		  db_scale_2bit),
-
-WSS_DOUBLE("PCM Playback Switch", 0,
-		CS4231_LEFT_OUTPUT, CS4231_RIGHT_OUTPUT, 7, 7, 1, 1),
-WSS_DOUBLE_TLV("PCM Playback Volume", 0,
-		CS4231_LEFT_OUTPUT, CS4231_RIGHT_OUTPUT, 0, 0, 63, 1,
-		db_scale_6bit),
-
-CS4236_DOUBLE("DSP Playback Switch", 0,
-		CS4236_LEFT_DSP, CS4236_RIGHT_DSP, 7, 7, 1, 1),
-CS4236_DOUBLE_TLV("DSP Playback Volume", 0,
-		  CS4236_LEFT_DSP, CS4236_RIGHT_DSP, 0, 0, 63, 1,
-		  db_scale_6bit),
-
-CS4236_DOUBLE("FM Playback Switch", 0,
-		CS4236_LEFT_FM, CS4236_RIGHT_FM, 7, 7, 1, 1),
-CS4236_DOUBLE_TLV("FM Playback Volume", 0,
-		  CS4236_LEFT_FM, CS4236_RIGHT_FM, 0, 0, 63, 1,
-		  db_scale_6bit),
-
-CS4236_DOUBLE("Wavetable Playback Switch", 0,
-		CS4236_LEFT_WAVE, CS4236_RIGHT_WAVE, 7, 7, 1, 1),
-CS4236_DOUBLE_TLV("Wavetable Playback Volume", 0,
-		  CS4236_LEFT_WAVE, CS4236_RIGHT_WAVE, 0, 0, 63, 1,
-		  db_scale_6bit_12db_max),
-
-WSS_DOUBLE("Synth Playback Switch", 0,
-		CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 7, 7, 1, 1),
-WSS_DOUBLE_TLV("Synth Volume", 0,
-		CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 0, 0, 31, 1,
-		db_scale_5bit_12db_max),
-WSS_DOUBLE("Synth Capture Switch", 0,
-		CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 6, 6, 1, 1),
-WSS_DOUBLE("Synth Capture Bypass", 0,
-		CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 5, 5, 1, 1),
-
-CS4236_DOUBLE("Mic Playback Switch", 0,
-		CS4236_LEFT_MIC, CS4236_RIGHT_MIC, 6, 6, 1, 1),
-CS4236_DOUBLE("Mic Capture Switch", 0,
-		CS4236_LEFT_MIC, CS4236_RIGHT_MIC, 7, 7, 1, 1),
-CS4236_DOUBLE_TLV("Mic Volume", 0, CS4236_LEFT_MIC, CS4236_RIGHT_MIC,
-		  0, 0, 31, 1, db_scale_5bit_22db_max),
-CS4236_DOUBLE("Mic Playback Boost (+20dB)", 0,
-		CS4236_LEFT_MIC, CS4236_RIGHT_MIC, 5, 5, 1, 0),
-
-WSS_DOUBLE("Line Playback Switch", 0,
-		CS4231_AUX1_LEFT_INPUT, CS4231_AUX1_RIGHT_INPUT, 7, 7, 1, 1),
-WSS_DOUBLE_TLV("Line Volume", 0,
-		CS4231_AUX1_LEFT_INPUT, CS4231_AUX1_RIGHT_INPUT, 0, 0, 31, 1,
-		db_scale_5bit_12db_max),
-WSS_DOUBLE("Line Capture Switch", 0,
-		CS4231_AUX1_LEFT_INPUT, CS4231_AUX1_RIGHT_INPUT, 6, 6, 1, 1),
-WSS_DOUBLE("Line Capture Bypass", 0,
-		CS4231_AUX1_LEFT_INPUT, CS4231_AUX1_RIGHT_INPUT, 5, 5, 1, 1),
-
-WSS_DOUBLE("CD Playback Switch", 0,
-		CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 7, 7, 1, 1),
-WSS_DOUBLE_TLV("CD Volume", 0,
-		CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 0, 0, 31, 1,
-		db_scale_5bit_12db_max),
-WSS_DOUBLE("CD Capture Switch", 0,
-		CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 6, 6, 1, 1),
-
-CS4236_DOUBLE1("Mono Output Playback Switch", 0,
-		CS4231_MONO_CTRL, CS4236_RIGHT_MIX_CTRL, 6, 7, 1, 1),
-CS4236_DOUBLE1("Beep Playback Switch", 0,
-		CS4231_MONO_CTRL, CS4236_LEFT_MIX_CTRL, 7, 7, 1, 1),
-WSS_SINGLE_TLV("Beep Playback Volume", 0, CS4231_MONO_CTRL, 0, 15, 1,
-		db_scale_4bit),
-WSS_SINGLE("Beep Bypass Playback Switch", 0, CS4231_MONO_CTRL, 5, 1, 0),
-
-WSS_DOUBLE_TLV("Capture Volume", 0, CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT,
-		0, 0, 15, 0, db_scale_rec_gain),
-WSS_DOUBLE("Analog Loopback Capture Switch", 0,
-		CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, 7, 7, 1, 0),
-
-WSS_SINGLE("Loopback Digital Playback Switch", 0, CS4231_LOOPBACK, 0, 1, 0),
-CS4236_DOUBLE1_TLV("Loopback Digital Playback Volume", 0,
-		   CS4231_LOOPBACK, CS4236_RIGHT_LOOPBACK, 2, 0, 63, 1,
-		   db_scale_6bit),
-};
-
-static const DECLARE_TLV_DB_SCALE(db_scale_5bit_6db_max, -5600, 200, 0);
-static const DECLARE_TLV_DB_SCALE(db_scale_2bit_16db_max, -2400, 800, 0);
-
-static struct snd_kcontrol_new snd_cs4235_controls[] = {
-
-WSS_DOUBLE("Master Playback Switch", 0,
-		CS4235_LEFT_MASTER, CS4235_RIGHT_MASTER, 7, 7, 1, 1),
-WSS_DOUBLE_TLV("Master Playback Volume", 0,
-		CS4235_LEFT_MASTER, CS4235_RIGHT_MASTER, 0, 0, 31, 1,
-		db_scale_5bit_6db_max),
-
-CS4235_OUTPUT_ACCU("Playback Volume", 0, db_scale_2bit_16db_max),
-
-WSS_DOUBLE("Synth Playback Switch", 1,
-		CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 7, 7, 1, 1),
-WSS_DOUBLE("Synth Capture Switch", 1,
-		CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 6, 6, 1, 1),
-WSS_DOUBLE_TLV("Synth Volume", 1,
-		CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 0, 0, 31, 1,
-		db_scale_5bit_12db_max),
-
-CS4236_DOUBLE_TLV("Capture Volume", 0,
-		  CS4236_LEFT_MIX_CTRL, CS4236_RIGHT_MIX_CTRL, 5, 5, 3, 1,
-		  db_scale_2bit),
-
-WSS_DOUBLE("PCM Playback Switch", 0,
-		CS4231_LEFT_OUTPUT, CS4231_RIGHT_OUTPUT, 7, 7, 1, 1),
-WSS_DOUBLE("PCM Capture Switch", 0,
-		CS4236_DAC_MUTE, CS4236_DAC_MUTE, 7, 6, 1, 1),
-WSS_DOUBLE_TLV("PCM Volume", 0,
-		CS4231_LEFT_OUTPUT, CS4231_RIGHT_OUTPUT, 0, 0, 63, 1,
-		db_scale_6bit),
-
-CS4236_DOUBLE("DSP Switch", 0, CS4236_LEFT_DSP, CS4236_RIGHT_DSP, 7, 7, 1, 1),
-
-CS4236_DOUBLE("FM Switch", 0, CS4236_LEFT_FM, CS4236_RIGHT_FM, 7, 7, 1, 1),
-
-CS4236_DOUBLE("Wavetable Switch", 0,
-		CS4236_LEFT_WAVE, CS4236_RIGHT_WAVE, 7, 7, 1, 1),
-
-CS4236_DOUBLE("Mic Capture Switch", 0,
-		CS4236_LEFT_MIC, CS4236_RIGHT_MIC, 7, 7, 1, 1),
-CS4236_DOUBLE("Mic Playback Switch", 0,
-		CS4236_LEFT_MIC, CS4236_RIGHT_MIC, 6, 6, 1, 1),
-CS4236_SINGLE_TLV("Mic Volume", 0, CS4236_LEFT_MIC, 0, 31, 1,
-		  db_scale_5bit_22db_max),
-CS4236_SINGLE("Mic Boost (+20dB)", 0, CS4236_LEFT_MIC, 5, 1, 0),
-
-WSS_DOUBLE("Line Playback Switch", 0,
-		CS4231_AUX1_LEFT_INPUT, CS4231_AUX1_RIGHT_INPUT, 7, 7, 1, 1),
-WSS_DOUBLE("Line Capture Switch", 0,
-		CS4231_AUX1_LEFT_INPUT, CS4231_AUX1_RIGHT_INPUT, 6, 6, 1, 1),
-WSS_DOUBLE_TLV("Line Volume", 0,
-		CS4231_AUX1_LEFT_INPUT, CS4231_AUX1_RIGHT_INPUT, 0, 0, 31, 1,
-		db_scale_5bit_12db_max),
-
-WSS_DOUBLE("CD Playback Switch", 1,
-		CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 7, 7, 1, 1),
-WSS_DOUBLE("CD Capture Switch", 1,
-		CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 6, 6, 1, 1),
-WSS_DOUBLE_TLV("CD Volume", 1,
-		CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 0, 0, 31, 1,
-		db_scale_5bit_12db_max),
-
-CS4236_DOUBLE1("Beep Playback Switch", 0,
-		CS4231_MONO_CTRL, CS4236_LEFT_MIX_CTRL, 7, 7, 1, 1),
-WSS_SINGLE("Beep Playback Volume", 0, CS4231_MONO_CTRL, 0, 15, 1),
-
-WSS_DOUBLE("Analog Loopback Switch", 0,
-		CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, 7, 7, 1, 0),
-};
-
-#define CS4236_IEC958_ENABLE(xname, xindex) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
-  .info = snd_cs4236_info_single, \
-  .get = snd_cs4236_get_iec958_switch, .put = snd_cs4236_put_iec958_switch, \
-  .private_value = 1 << 16 }
-
-static int snd_cs4236_get_iec958_switch(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);
-	unsigned long flags;
-	
-	spin_lock_irqsave(&chip->reg_lock, flags);
-	ucontrol->value.integer.value[0] = chip->image[CS4231_ALT_FEATURE_1] & 0x02 ? 1 : 0;
-#if 0
-	printk(KERN_DEBUG "get valid: ALT = 0x%x, C3 = 0x%x, C4 = 0x%x, "
-	       "C5 = 0x%x, C6 = 0x%x, C8 = 0x%x\n",
-			snd_wss_in(chip, CS4231_ALT_FEATURE_1),
-			snd_cs4236_ctrl_in(chip, 3),
-			snd_cs4236_ctrl_in(chip, 4),
-			snd_cs4236_ctrl_in(chip, 5),
-			snd_cs4236_ctrl_in(chip, 6),
-			snd_cs4236_ctrl_in(chip, 8));
-#endif
-	spin_unlock_irqrestore(&chip->reg_lock, flags);
-	return 0;
-}
-
-static int snd_cs4236_put_iec958_switch(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);
-	unsigned long flags;
-	int change;
-	unsigned short enable, val;
-	
-	enable = ucontrol->value.integer.value[0] & 1;
-
-	mutex_lock(&chip->mce_mutex);
-	snd_wss_mce_up(chip);
-	spin_lock_irqsave(&chip->reg_lock, flags);
-	val = (chip->image[CS4231_ALT_FEATURE_1] & ~0x0e) | (0<<2) | (enable << 1);
-	change = val != chip->image[CS4231_ALT_FEATURE_1];
-	snd_wss_out(chip, CS4231_ALT_FEATURE_1, val);
-	val = snd_cs4236_ctrl_in(chip, 4) | 0xc0;
-	snd_cs4236_ctrl_out(chip, 4, val);
-	udelay(100);
-	val &= ~0x40;
-	snd_cs4236_ctrl_out(chip, 4, val);
-	spin_unlock_irqrestore(&chip->reg_lock, flags);
-	snd_wss_mce_down(chip);
-	mutex_unlock(&chip->mce_mutex);
-
-#if 0
-	printk(KERN_DEBUG "set valid: ALT = 0x%x, C3 = 0x%x, C4 = 0x%x, "
-	       "C5 = 0x%x, C6 = 0x%x, C8 = 0x%x\n",
-			snd_wss_in(chip, CS4231_ALT_FEATURE_1),
-			snd_cs4236_ctrl_in(chip, 3),
-			snd_cs4236_ctrl_in(chip, 4),
-			snd_cs4236_ctrl_in(chip, 5),
-			snd_cs4236_ctrl_in(chip, 6),
-			snd_cs4236_ctrl_in(chip, 8));
-#endif
-	return change;
-}
-
-static struct snd_kcontrol_new snd_cs4236_iec958_controls[] = {
-CS4236_IEC958_ENABLE("IEC958 Output Enable", 0),
-CS4236_SINGLEC("IEC958 Output Validity", 0, 4, 4, 1, 0),
-CS4236_SINGLEC("IEC958 Output User", 0, 4, 5, 1, 0),
-CS4236_SINGLEC("IEC958 Output CSBR", 0, 4, 6, 1, 0),
-CS4236_SINGLEC("IEC958 Output Channel Status Low", 0, 5, 1, 127, 0),
-CS4236_SINGLEC("IEC958 Output Channel Status High", 0, 6, 0, 255, 0)
-};
-
-static struct snd_kcontrol_new snd_cs4236_3d_controls_cs4235[] = {
-CS4236_SINGLEC("3D Control - Switch", 0, 3, 4, 1, 0),
-CS4236_SINGLEC("3D Control - Space", 0, 2, 4, 15, 1)
-};
-
-static struct snd_kcontrol_new snd_cs4236_3d_controls_cs4237[] = {
-CS4236_SINGLEC("3D Control - Switch", 0, 3, 7, 1, 0),
-CS4236_SINGLEC("3D Control - Space", 0, 2, 4, 15, 1),
-CS4236_SINGLEC("3D Control - Center", 0, 2, 0, 15, 1),
-CS4236_SINGLEC("3D Control - Mono", 0, 3, 6, 1, 0),
-CS4236_SINGLEC("3D Control - IEC958", 0, 3, 5, 1, 0)
-};
-
-static struct snd_kcontrol_new snd_cs4236_3d_controls_cs4238[] = {
-CS4236_SINGLEC("3D Control - Switch", 0, 3, 4, 1, 0),
-CS4236_SINGLEC("3D Control - Space", 0, 2, 4, 15, 1),
-CS4236_SINGLEC("3D Control - Volume", 0, 2, 0, 15, 1),
-CS4236_SINGLEC("3D Control - IEC958", 0, 3, 5, 1, 0)
-};
-
-int snd_cs4236_mixer(struct snd_wss *chip)
-{
-	struct snd_card *card;
-	unsigned int idx, count;
-	int err;
-	struct snd_kcontrol_new *kcontrol;
-
-	if (snd_BUG_ON(!chip || !chip->card))
-		return -EINVAL;
-	card = chip->card;
-	strcpy(card->mixername, snd_wss_chip_id(chip));
-
-	if (chip->hardware == WSS_HW_CS4235 ||
-	    chip->hardware == WSS_HW_CS4239) {
-		for (idx = 0; idx < ARRAY_SIZE(snd_cs4235_controls); idx++) {
-			if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_cs4235_controls[idx], chip))) < 0)
-				return err;
-		}
-	} else {
-		for (idx = 0; idx < ARRAY_SIZE(snd_cs4236_controls); idx++) {
-			if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_cs4236_controls[idx], chip))) < 0)
-				return err;
-		}
-	}
-	switch (chip->hardware) {
-	case WSS_HW_CS4235:
-	case WSS_HW_CS4239:
-		count = ARRAY_SIZE(snd_cs4236_3d_controls_cs4235);
-		kcontrol = snd_cs4236_3d_controls_cs4235;
-		break;
-	case WSS_HW_CS4237B:
-		count = ARRAY_SIZE(snd_cs4236_3d_controls_cs4237);
-		kcontrol = snd_cs4236_3d_controls_cs4237;
-		break;
-	case WSS_HW_CS4238B:
-		count = ARRAY_SIZE(snd_cs4236_3d_controls_cs4238);
-		kcontrol = snd_cs4236_3d_controls_cs4238;
-		break;
-	default:
-		count = 0;
-		kcontrol = NULL;
-	}
-	for (idx = 0; idx < count; idx++, kcontrol++) {
-		if ((err = snd_ctl_add(card, snd_ctl_new1(kcontrol, chip))) < 0)
-			return err;
-	}
-	if (chip->hardware == WSS_HW_CS4237B ||
-	    chip->hardware == WSS_HW_CS4238B) {
-		for (idx = 0; idx < ARRAY_SIZE(snd_cs4236_iec958_controls); idx++) {
-			if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_cs4236_iec958_controls[idx], chip))) < 0)
-				return err;
-		}
-	}
-	return 0;
-}