Moved, renamed, and deleted files

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

7 files changed, 0 insertions, 3433 deletions

diff --git a/ANDROID_3.4.5/sound/i2c/other/Makefile b/ANDROID_3.4.5/sound/i2c/other/Makefile
deleted file mode 100644
index c95d8f1a..00000000
--- a/ANDROID_3.4.5/sound/i2c/other/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Makefile for ALSA
-# Copyright (c) 2003 by Jaroslav Kysela <perex@perex.cz>
-#
-
-snd-ak4114-objs := ak4114.o
-snd-ak4117-objs := ak4117.o
-snd-ak4113-objs := ak4113.o
-snd-ak4xxx-adda-objs := ak4xxx-adda.o
-snd-pt2258-objs := pt2258.o
-snd-tea575x-tuner-objs := tea575x-tuner.o
-
-# Module Dependency
-obj-$(CONFIG_SND_PDAUDIOCF) += snd-ak4117.o
-obj-$(CONFIG_SND_ICE1712) += snd-ak4xxx-adda.o
-obj-$(CONFIG_SND_ICE1724) += snd-ak4114.o snd-ak4113.o snd-ak4xxx-adda.o snd-pt2258.o
-obj-$(CONFIG_SND_TEA575X) += snd-tea575x-tuner.o
diff --git a/ANDROID_3.4.5/sound/i2c/other/ak4113.c b/ANDROID_3.4.5/sound/i2c/other/ak4113.c
deleted file mode 100644
index dde5c9c9..00000000
--- a/ANDROID_3.4.5/sound/i2c/other/ak4113.c
+++ /dev/null
@@ -1,639 +0,0 @@
-/*
- *  Routines for control of the AK4113 via I2C/4-wire serial interface
- *  IEC958 (S/PDIF) receiver by Asahi Kasei
- *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
- *  Copyright (c) by Pavel Hofman <pavel.hofman@ivitera.com>
- *
- *
- *   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 <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/module.h>
-#include <sound/core.h>
-#include <sound/control.h>
-#include <sound/pcm.h>
-#include <sound/ak4113.h>
-#include <sound/asoundef.h>
-#include <sound/info.h>
-
-MODULE_AUTHOR("Pavel Hofman <pavel.hofman@ivitera.com>");
-MODULE_DESCRIPTION("AK4113 IEC958 (S/PDIF) receiver by Asahi Kasei");
-MODULE_LICENSE("GPL");
-
-#define AK4113_ADDR			0x00 /* fixed address */
-
-static void ak4113_stats(struct work_struct *work);
-static void ak4113_init_regs(struct ak4113 *chip);
-
-
-static void reg_write(struct ak4113 *ak4113, unsigned char reg,
-		unsigned char val)
-{
-	ak4113->write(ak4113->private_data, reg, val);
-	if (reg < sizeof(ak4113->regmap))
-		ak4113->regmap[reg] = val;
-}
-
-static inline unsigned char reg_read(struct ak4113 *ak4113, unsigned char reg)
-{
-	return ak4113->read(ak4113->private_data, reg);
-}
-
-static void snd_ak4113_free(struct ak4113 *chip)
-{
-	chip->init = 1;	/* don't schedule new work */
-	mb();
-	cancel_delayed_work_sync(&chip->work);
-	kfree(chip);
-}
-
-static int snd_ak4113_dev_free(struct snd_device *device)
-{
-	struct ak4113 *chip = device->device_data;
-	snd_ak4113_free(chip);
-	return 0;
-}
-
-int snd_ak4113_create(struct snd_card *card, ak4113_read_t *read,
-		ak4113_write_t *write, const unsigned char *pgm,
-		void *private_data, struct ak4113 **r_ak4113)
-{
-	struct ak4113 *chip;
-	int err = 0;
-	unsigned char reg;
-	static struct snd_device_ops ops = {
-		.dev_free =     snd_ak4113_dev_free,
-	};
-
-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);
-	if (chip == NULL)
-		return -ENOMEM;
-	spin_lock_init(&chip->lock);
-	chip->card = card;
-	chip->read = read;
-	chip->write = write;
-	chip->private_data = private_data;
-	INIT_DELAYED_WORK(&chip->work, ak4113_stats);
-
-	for (reg = 0; reg < AK4113_WRITABLE_REGS ; reg++)
-		chip->regmap[reg] = pgm[reg];
-	ak4113_init_regs(chip);
-
-	chip->rcs0 = reg_read(chip, AK4113_REG_RCS0) & ~(AK4113_QINT |
-			AK4113_CINT | AK4113_STC);
-	chip->rcs1 = reg_read(chip, AK4113_REG_RCS1);
-	chip->rcs2 = reg_read(chip, AK4113_REG_RCS2);
-	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
-	if (err < 0)
-		goto __fail;
-
-	if (r_ak4113)
-		*r_ak4113 = chip;
-	return 0;
-
-__fail:
-	snd_ak4113_free(chip);
-	return err < 0 ? err : -EIO;
-}
-EXPORT_SYMBOL_GPL(snd_ak4113_create);
-
-void snd_ak4113_reg_write(struct ak4113 *chip, unsigned char reg,
-		unsigned char mask, unsigned char val)
-{
-	if (reg >= AK4113_WRITABLE_REGS)
-		return;
-	reg_write(chip, reg, (chip->regmap[reg] & ~mask) | val);
-}
-EXPORT_SYMBOL_GPL(snd_ak4113_reg_write);
-
-static void ak4113_init_regs(struct ak4113 *chip)
-{
-	unsigned char old = chip->regmap[AK4113_REG_PWRDN], reg;
-
-	/* bring the chip to reset state and powerdown state */
-	reg_write(chip, AK4113_REG_PWRDN, old & ~(AK4113_RST|AK4113_PWN));
-	udelay(200);
-	/* release reset, but leave powerdown */
-	reg_write(chip, AK4113_REG_PWRDN, (old | AK4113_RST) & ~AK4113_PWN);
-	udelay(200);
-	for (reg = 1; reg < AK4113_WRITABLE_REGS; reg++)
-		reg_write(chip, reg, chip->regmap[reg]);
-	/* release powerdown, everything is initialized now */
-	reg_write(chip, AK4113_REG_PWRDN, old | AK4113_RST | AK4113_PWN);
-}
-
-void snd_ak4113_reinit(struct ak4113 *chip)
-{
-	chip->init = 1;
-	mb();
-	flush_delayed_work_sync(&chip->work);
-	ak4113_init_regs(chip);
-	/* bring up statistics / event queing */
-	chip->init = 0;
-	if (chip->kctls[0])
-		schedule_delayed_work(&chip->work, HZ / 10);
-}
-EXPORT_SYMBOL_GPL(snd_ak4113_reinit);
-
-static unsigned int external_rate(unsigned char rcs1)
-{
-	switch (rcs1 & (AK4113_FS0|AK4113_FS1|AK4113_FS2|AK4113_FS3)) {
-	case AK4113_FS_8000HZ:
-		return 8000;
-	case AK4113_FS_11025HZ:
-		return 11025;
-	case AK4113_FS_16000HZ:
-		return 16000;
-	case AK4113_FS_22050HZ:
-		return 22050;
-	case AK4113_FS_24000HZ:
-		return 24000;
-	case AK4113_FS_32000HZ:
-		return 32000;
-	case AK4113_FS_44100HZ:
-		return 44100;
-	case AK4113_FS_48000HZ:
-		return 48000;
-	case AK4113_FS_64000HZ:
-		return 64000;
-	case AK4113_FS_88200HZ:
-		return 88200;
-	case AK4113_FS_96000HZ:
-		return 96000;
-	case AK4113_FS_176400HZ:
-		return 176400;
-	case AK4113_FS_192000HZ:
-		return 192000;
-	default:
-		return 0;
-	}
-}
-
-static int snd_ak4113_in_error_info(struct snd_kcontrol *kcontrol,
-				    struct snd_ctl_elem_info *uinfo)
-{
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-	uinfo->count = 1;
-	uinfo->value.integer.min = 0;
-	uinfo->value.integer.max = LONG_MAX;
-	return 0;
-}
-
-static int snd_ak4113_in_error_get(struct snd_kcontrol *kcontrol,
-				   struct snd_ctl_elem_value *ucontrol)
-{
-	struct ak4113 *chip = snd_kcontrol_chip(kcontrol);
-	long *ptr;
-
-	spin_lock_irq(&chip->lock);
-	ptr = (long *)(((char *)chip) + kcontrol->private_value);
-	ucontrol->value.integer.value[0] = *ptr;
-	*ptr = 0;
-	spin_unlock_irq(&chip->lock);
-	return 0;
-}
-
-#define snd_ak4113_in_bit_info		snd_ctl_boolean_mono_info
-
-static int snd_ak4113_in_bit_get(struct snd_kcontrol *kcontrol,
-				 struct snd_ctl_elem_value *ucontrol)
-{
-	struct ak4113 *chip = snd_kcontrol_chip(kcontrol);
-	unsigned char reg = kcontrol->private_value & 0xff;
-	unsigned char bit = (kcontrol->private_value >> 8) & 0xff;
-	unsigned char inv = (kcontrol->private_value >> 31) & 1;
-
-	ucontrol->value.integer.value[0] =
-		((reg_read(chip, reg) & (1 << bit)) ? 1 : 0) ^ inv;
-	return 0;
-}
-
-static int snd_ak4113_rx_info(struct snd_kcontrol *kcontrol,
-			      struct snd_ctl_elem_info *uinfo)
-{
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-	uinfo->count = 1;
-	uinfo->value.integer.min = 0;
-	uinfo->value.integer.max = 5;
-	return 0;
-}
-
-static int snd_ak4113_rx_get(struct snd_kcontrol *kcontrol,
-			     struct snd_ctl_elem_value *ucontrol)
-{
-	struct ak4113 *chip = snd_kcontrol_chip(kcontrol);
-
-	ucontrol->value.integer.value[0] =
-		(AK4113_IPS(chip->regmap[AK4113_REG_IO1]));
-	return 0;
-}
-
-static int snd_ak4113_rx_put(struct snd_kcontrol *kcontrol,
-			     struct snd_ctl_elem_value *ucontrol)
-{
-	struct ak4113 *chip = snd_kcontrol_chip(kcontrol);
-	int change;
-	u8 old_val;
-
-	spin_lock_irq(&chip->lock);
-	old_val = chip->regmap[AK4113_REG_IO1];
-	change = ucontrol->value.integer.value[0] != AK4113_IPS(old_val);
-	if (change)
-		reg_write(chip, AK4113_REG_IO1,
-				(old_val & (~AK4113_IPS(0xff))) |
-				(AK4113_IPS(ucontrol->value.integer.value[0])));
-	spin_unlock_irq(&chip->lock);
-	return change;
-}
-
-static int snd_ak4113_rate_info(struct snd_kcontrol *kcontrol,
-				struct snd_ctl_elem_info *uinfo)
-{
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-	uinfo->count = 1;
-	uinfo->value.integer.min = 0;
-	uinfo->value.integer.max = 192000;
-	return 0;
-}
-
-static int snd_ak4113_rate_get(struct snd_kcontrol *kcontrol,
-			       struct snd_ctl_elem_value *ucontrol)
-{
-	struct ak4113 *chip = snd_kcontrol_chip(kcontrol);
-
-	ucontrol->value.integer.value[0] = external_rate(reg_read(chip,
-				AK4113_REG_RCS1));
-	return 0;
-}
-
-static int snd_ak4113_spdif_info(struct snd_kcontrol *kcontrol,
-		struct snd_ctl_elem_info *uinfo)
-{
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
-	uinfo->count = 1;
-	return 0;
-}
-
-static int snd_ak4113_spdif_get(struct snd_kcontrol *kcontrol,
-				struct snd_ctl_elem_value *ucontrol)
-{
-	struct ak4113 *chip = snd_kcontrol_chip(kcontrol);
-	unsigned i;
-
-	for (i = 0; i < AK4113_REG_RXCSB_SIZE; i++)
-		ucontrol->value.iec958.status[i] = reg_read(chip,
-				AK4113_REG_RXCSB0 + i);
-	return 0;
-}
-
-static int snd_ak4113_spdif_mask_info(struct snd_kcontrol *kcontrol,
-		struct snd_ctl_elem_info *uinfo)
-{
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
-	uinfo->count = 1;
-	return 0;
-}
-
-static int snd_ak4113_spdif_mask_get(struct snd_kcontrol *kcontrol,
-				      struct snd_ctl_elem_value *ucontrol)
-{
-	memset(ucontrol->value.iec958.status, 0xff, AK4113_REG_RXCSB_SIZE);
-	return 0;
-}
-
-static int snd_ak4113_spdif_pinfo(struct snd_kcontrol *kcontrol,
-		struct snd_ctl_elem_info *uinfo)
-{
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-	uinfo->value.integer.min = 0;
-	uinfo->value.integer.max = 0xffff;
-	uinfo->count = 4;
-	return 0;
-}
-
-static int snd_ak4113_spdif_pget(struct snd_kcontrol *kcontrol,
-				 struct snd_ctl_elem_value *ucontrol)
-{
-	struct ak4113 *chip = snd_kcontrol_chip(kcontrol);
-	unsigned short tmp;
-
-	ucontrol->value.integer.value[0] = 0xf8f2;
-	ucontrol->value.integer.value[1] = 0x4e1f;
-	tmp = reg_read(chip, AK4113_REG_Pc0) |
-		(reg_read(chip, AK4113_REG_Pc1) << 8);
-	ucontrol->value.integer.value[2] = tmp;
-	tmp = reg_read(chip, AK4113_REG_Pd0) |
-		(reg_read(chip, AK4113_REG_Pd1) << 8);
-	ucontrol->value.integer.value[3] = tmp;
-	return 0;
-}
-
-static int snd_ak4113_spdif_qinfo(struct snd_kcontrol *kcontrol,
-		struct snd_ctl_elem_info *uinfo)
-{
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES;
-	uinfo->count = AK4113_REG_QSUB_SIZE;
-	return 0;
-}
-
-static int snd_ak4113_spdif_qget(struct snd_kcontrol *kcontrol,
-				 struct snd_ctl_elem_value *ucontrol)
-{
-	struct ak4113 *chip = snd_kcontrol_chip(kcontrol);
-	unsigned i;
-
-	for (i = 0; i < AK4113_REG_QSUB_SIZE; i++)
-		ucontrol->value.bytes.data[i] = reg_read(chip,
-				AK4113_REG_QSUB_ADDR + i);
-	return 0;
-}
-
-/* Don't forget to change AK4113_CONTROLS define!!! */
-static struct snd_kcontrol_new snd_ak4113_iec958_controls[] = {
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 Parity Errors",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ |
-		SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4113_in_error_info,
-	.get =		snd_ak4113_in_error_get,
-	.private_value = offsetof(struct ak4113, parity_errors),
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 V-Bit Errors",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ |
-		SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4113_in_error_info,
-	.get =		snd_ak4113_in_error_get,
-	.private_value = offsetof(struct ak4113, v_bit_errors),
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 C-CRC Errors",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ |
-		SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4113_in_error_info,
-	.get =		snd_ak4113_in_error_get,
-	.private_value = offsetof(struct ak4113, ccrc_errors),
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 Q-CRC Errors",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ |
-		SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4113_in_error_info,
-	.get =		snd_ak4113_in_error_get,
-	.private_value = offsetof(struct ak4113, qcrc_errors),
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 External Rate",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ |
-		SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4113_rate_info,
-	.get =		snd_ak4113_rate_get,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		SNDRV_CTL_NAME_IEC958("", CAPTURE, MASK),
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ,
-	.info =		snd_ak4113_spdif_mask_info,
-	.get =		snd_ak4113_spdif_mask_get,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		SNDRV_CTL_NAME_IEC958("", CAPTURE, DEFAULT),
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ |
-		SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4113_spdif_info,
-	.get =		snd_ak4113_spdif_get,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 Preample Capture Default",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ |
-		SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4113_spdif_pinfo,
-	.get =		snd_ak4113_spdif_pget,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 Q-subcode Capture Default",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ |
-		SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4113_spdif_qinfo,
-	.get =		snd_ak4113_spdif_qget,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 Audio",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ |
-		SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4113_in_bit_info,
-	.get =		snd_ak4113_in_bit_get,
-	.private_value = (1<<31) | (1<<8) | AK4113_REG_RCS0,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 Non-PCM Bitstream",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ |
-		SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4113_in_bit_info,
-	.get =		snd_ak4113_in_bit_get,
-	.private_value = (0<<8) | AK4113_REG_RCS1,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 DTS Bitstream",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ |
-		SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4113_in_bit_info,
-	.get =		snd_ak4113_in_bit_get,
-	.private_value = (1<<8) | AK4113_REG_RCS1,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"AK4113 Input Select",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ |
-		SNDRV_CTL_ELEM_ACCESS_WRITE,
-	.info =		snd_ak4113_rx_info,
-	.get =		snd_ak4113_rx_get,
-	.put =		snd_ak4113_rx_put,
-}
-};
-
-static void snd_ak4113_proc_regs_read(struct snd_info_entry *entry,
-		struct snd_info_buffer *buffer)
-{
-	struct ak4113 *ak4113 = entry->private_data;
-	int reg, val;
-	/* all ak4113 registers 0x00 - 0x1c */
-	for (reg = 0; reg < 0x1d; reg++) {
-		val = reg_read(ak4113, reg);
-		snd_iprintf(buffer, "0x%02x = 0x%02x\n", reg, val);
-	}
-}
-
-static void snd_ak4113_proc_init(struct ak4113 *ak4113)
-{
-	struct snd_info_entry *entry;
-	if (!snd_card_proc_new(ak4113->card, "ak4113", &entry))
-		snd_info_set_text_ops(entry, ak4113, snd_ak4113_proc_regs_read);
-}
-
-int snd_ak4113_build(struct ak4113 *ak4113,
-		struct snd_pcm_substream *cap_substream)
-{
-	struct snd_kcontrol *kctl;
-	unsigned int idx;
-	int err;
-
-	if (snd_BUG_ON(!cap_substream))
-		return -EINVAL;
-	ak4113->substream = cap_substream;
-	for (idx = 0; idx < AK4113_CONTROLS; idx++) {
-		kctl = snd_ctl_new1(&snd_ak4113_iec958_controls[idx], ak4113);
-		if (kctl == NULL)
-			return -ENOMEM;
-		kctl->id.device = cap_substream->pcm->device;
-		kctl->id.subdevice = cap_substream->number;
-		err = snd_ctl_add(ak4113->card, kctl);
-		if (err < 0)
-			return err;
-		ak4113->kctls[idx] = kctl;
-	}
-	snd_ak4113_proc_init(ak4113);
-	/* trigger workq */
-	schedule_delayed_work(&ak4113->work, HZ / 10);
-	return 0;
-}
-EXPORT_SYMBOL_GPL(snd_ak4113_build);
-
-int snd_ak4113_external_rate(struct ak4113 *ak4113)
-{
-	unsigned char rcs1;
-
-	rcs1 = reg_read(ak4113, AK4113_REG_RCS1);
-	return external_rate(rcs1);
-}
-EXPORT_SYMBOL_GPL(snd_ak4113_external_rate);
-
-int snd_ak4113_check_rate_and_errors(struct ak4113 *ak4113, unsigned int flags)
-{
-	struct snd_pcm_runtime *runtime =
-		ak4113->substream ? ak4113->substream->runtime : NULL;
-	unsigned long _flags;
-	int res = 0;
-	unsigned char rcs0, rcs1, rcs2;
-	unsigned char c0, c1;
-
-	rcs1 = reg_read(ak4113, AK4113_REG_RCS1);
-	if (flags & AK4113_CHECK_NO_STAT)
-		goto __rate;
-	rcs0 = reg_read(ak4113, AK4113_REG_RCS0);
-	rcs2 = reg_read(ak4113, AK4113_REG_RCS2);
-	spin_lock_irqsave(&ak4113->lock, _flags);
-	if (rcs0 & AK4113_PAR)
-		ak4113->parity_errors++;
-	if (rcs0 & AK4113_V)
-		ak4113->v_bit_errors++;
-	if (rcs2 & AK4113_CCRC)
-		ak4113->ccrc_errors++;
-	if (rcs2 & AK4113_QCRC)
-		ak4113->qcrc_errors++;
-	c0 = (ak4113->rcs0 & (AK4113_QINT | AK4113_CINT | AK4113_STC |
-				AK4113_AUDION | AK4113_AUTO | AK4113_UNLCK)) ^
-		(rcs0 & (AK4113_QINT | AK4113_CINT | AK4113_STC |
-			 AK4113_AUDION | AK4113_AUTO | AK4113_UNLCK));
-	c1 = (ak4113->rcs1 & (AK4113_DTSCD | AK4113_NPCM | AK4113_PEM |
-				AK4113_DAT | 0xf0)) ^
-		(rcs1 & (AK4113_DTSCD | AK4113_NPCM | AK4113_PEM |
-			 AK4113_DAT | 0xf0));
-	ak4113->rcs0 = rcs0 & ~(AK4113_QINT | AK4113_CINT | AK4113_STC);
-	ak4113->rcs1 = rcs1;
-	ak4113->rcs2 = rcs2;
-	spin_unlock_irqrestore(&ak4113->lock, _flags);
-
-	if (rcs0 & AK4113_PAR)
-		snd_ctl_notify(ak4113->card, SNDRV_CTL_EVENT_MASK_VALUE,
-				&ak4113->kctls[0]->id);
-	if (rcs0 & AK4113_V)
-		snd_ctl_notify(ak4113->card, SNDRV_CTL_EVENT_MASK_VALUE,
-				&ak4113->kctls[1]->id);
-	if (rcs2 & AK4113_CCRC)
-		snd_ctl_notify(ak4113->card, SNDRV_CTL_EVENT_MASK_VALUE,
-				&ak4113->kctls[2]->id);
-	if (rcs2 & AK4113_QCRC)
-		snd_ctl_notify(ak4113->card, SNDRV_CTL_EVENT_MASK_VALUE,
-				&ak4113->kctls[3]->id);
-
-	/* rate change */
-	if (c1 & 0xf0)
-		snd_ctl_notify(ak4113->card, SNDRV_CTL_EVENT_MASK_VALUE,
-				&ak4113->kctls[4]->id);
-
-	if ((c1 & AK4113_PEM) | (c0 & AK4113_CINT))
-		snd_ctl_notify(ak4113->card, SNDRV_CTL_EVENT_MASK_VALUE,
-				&ak4113->kctls[6]->id);
-	if (c0 & AK4113_QINT)
-		snd_ctl_notify(ak4113->card, SNDRV_CTL_EVENT_MASK_VALUE,
-				&ak4113->kctls[8]->id);
-
-	if (c0 & AK4113_AUDION)
-		snd_ctl_notify(ak4113->card, SNDRV_CTL_EVENT_MASK_VALUE,
-				&ak4113->kctls[9]->id);
-	if (c1 & AK4113_NPCM)
-		snd_ctl_notify(ak4113->card, SNDRV_CTL_EVENT_MASK_VALUE,
-				&ak4113->kctls[10]->id);
-	if (c1 & AK4113_DTSCD)
-		snd_ctl_notify(ak4113->card, SNDRV_CTL_EVENT_MASK_VALUE,
-				&ak4113->kctls[11]->id);
-
-	if (ak4113->change_callback && (c0 | c1) != 0)
-		ak4113->change_callback(ak4113, c0, c1);
-
-__rate:
-	/* compare rate */
-	res = external_rate(rcs1);
-	if (!(flags & AK4113_CHECK_NO_RATE) && runtime &&
-			(runtime->rate != res)) {
-		snd_pcm_stream_lock_irqsave(ak4113->substream, _flags);
-		if (snd_pcm_running(ak4113->substream)) {
-			/*printk(KERN_DEBUG "rate changed (%i <- %i)\n",
-			 * runtime->rate, res); */
-			snd_pcm_stop(ak4113->substream,
-					SNDRV_PCM_STATE_DRAINING);
-			wake_up(&runtime->sleep);
-			res = 1;
-		}
-		snd_pcm_stream_unlock_irqrestore(ak4113->substream, _flags);
-	}
-	return res;
-}
-EXPORT_SYMBOL_GPL(snd_ak4113_check_rate_and_errors);
-
-static void ak4113_stats(struct work_struct *work)
-{
-	struct ak4113 *chip = container_of(work, struct ak4113, work.work);
-
-	if (!chip->init)
-		snd_ak4113_check_rate_and_errors(chip, chip->check_flags);
-
-	schedule_delayed_work(&chip->work, HZ / 10);
-}
diff --git a/ANDROID_3.4.5/sound/i2c/other/ak4114.c b/ANDROID_3.4.5/sound/i2c/other/ak4114.c
deleted file mode 100644
index fdf3c1b6..00000000
--- a/ANDROID_3.4.5/sound/i2c/other/ak4114.c
+++ /dev/null
@@ -1,626 +0,0 @@
-/*
- *  Routines for control of the AK4114 via I2C and 4-wire serial interface
- *  IEC958 (S/PDIF) receiver by Asahi Kasei
- *  Copyright (c) by 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 <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/module.h>
-#include <sound/core.h>
-#include <sound/control.h>
-#include <sound/pcm.h>
-#include <sound/ak4114.h>
-#include <sound/asoundef.h>
-#include <sound/info.h>
-
-MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
-MODULE_DESCRIPTION("AK4114 IEC958 (S/PDIF) receiver by Asahi Kasei");
-MODULE_LICENSE("GPL");
-
-#define AK4114_ADDR			0x00 /* fixed address */
-
-static void ak4114_stats(struct work_struct *work);
-static void ak4114_init_regs(struct ak4114 *chip);
-
-static void reg_write(struct ak4114 *ak4114, unsigned char reg, unsigned char val)
-{
-	ak4114->write(ak4114->private_data, reg, val);
-	if (reg <= AK4114_REG_INT1_MASK)
-		ak4114->regmap[reg] = val;
-	else if (reg >= AK4114_REG_TXCSB0 && reg <= AK4114_REG_TXCSB4)
-		ak4114->txcsb[reg-AK4114_REG_TXCSB0] = val;
-}
-
-static inline unsigned char reg_read(struct ak4114 *ak4114, unsigned char reg)
-{
-	return ak4114->read(ak4114->private_data, reg);
-}
-
-#if 0
-static void reg_dump(struct ak4114 *ak4114)
-{
-	int i;
-
-	printk(KERN_DEBUG "AK4114 REG DUMP:\n");
-	for (i = 0; i < 0x20; i++)
-		printk(KERN_DEBUG "reg[%02x] = %02x (%02x)\n", i, reg_read(ak4114, i), i < sizeof(ak4114->regmap) ? ak4114->regmap[i] : 0);
-}
-#endif
-
-static void snd_ak4114_free(struct ak4114 *chip)
-{
-	chip->init = 1;	/* don't schedule new work */
-	mb();
-	cancel_delayed_work_sync(&chip->work);
-	kfree(chip);
-}
-
-static int snd_ak4114_dev_free(struct snd_device *device)
-{
-	struct ak4114 *chip = device->device_data;
-	snd_ak4114_free(chip);
-	return 0;
-}
-
-int snd_ak4114_create(struct snd_card *card,
-		      ak4114_read_t *read, ak4114_write_t *write,
-		      const unsigned char pgm[7], const unsigned char txcsb[5],
-		      void *private_data, struct ak4114 **r_ak4114)
-{
-	struct ak4114 *chip;
-	int err = 0;
-	unsigned char reg;
-	static struct snd_device_ops ops = {
-		.dev_free =     snd_ak4114_dev_free,
-	};
-
-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);
-	if (chip == NULL)
-		return -ENOMEM;
-	spin_lock_init(&chip->lock);
-	chip->card = card;
-	chip->read = read;
-	chip->write = write;
-	chip->private_data = private_data;
-	INIT_DELAYED_WORK(&chip->work, ak4114_stats);
-
-	for (reg = 0; reg < 7; reg++)
-		chip->regmap[reg] = pgm[reg];
-	for (reg = 0; reg < 5; reg++)
-		chip->txcsb[reg] = txcsb[reg];
-
-	ak4114_init_regs(chip);
-
-	chip->rcs0 = reg_read(chip, AK4114_REG_RCS0) & ~(AK4114_QINT | AK4114_CINT);
-	chip->rcs1 = reg_read(chip, AK4114_REG_RCS1);
-
-	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0)
-		goto __fail;
-
-	if (r_ak4114)
-		*r_ak4114 = chip;
-	return 0;
-
-      __fail:
-	snd_ak4114_free(chip);
-	return err < 0 ? err : -EIO;
-}
-
-void snd_ak4114_reg_write(struct ak4114 *chip, unsigned char reg, unsigned char mask, unsigned char val)
-{
-	if (reg <= AK4114_REG_INT1_MASK)
-		reg_write(chip, reg, (chip->regmap[reg] & ~mask) | val);
-	else if (reg >= AK4114_REG_TXCSB0 && reg <= AK4114_REG_TXCSB4)
-		reg_write(chip, reg,
-			  (chip->txcsb[reg-AK4114_REG_TXCSB0] & ~mask) | val);
-}
-
-static void ak4114_init_regs(struct ak4114 *chip)
-{
-	unsigned char old = chip->regmap[AK4114_REG_PWRDN], reg;
-
-	/* bring the chip to reset state and powerdown state */
-	reg_write(chip, AK4114_REG_PWRDN, old & ~(AK4114_RST|AK4114_PWN));
-	udelay(200);
-	/* release reset, but leave powerdown */
-	reg_write(chip, AK4114_REG_PWRDN, (old | AK4114_RST) & ~AK4114_PWN);
-	udelay(200);
-	for (reg = 1; reg < 7; reg++)
-		reg_write(chip, reg, chip->regmap[reg]);
-	for (reg = 0; reg < 5; reg++)
-		reg_write(chip, reg + AK4114_REG_TXCSB0, chip->txcsb[reg]);
-	/* release powerdown, everything is initialized now */
-	reg_write(chip, AK4114_REG_PWRDN, old | AK4114_RST | AK4114_PWN);
-}
-
-void snd_ak4114_reinit(struct ak4114 *chip)
-{
-	chip->init = 1;
-	mb();
-	flush_delayed_work_sync(&chip->work);
-	ak4114_init_regs(chip);
-	/* bring up statistics / event queing */
-	chip->init = 0;
-	if (chip->kctls[0])
-		schedule_delayed_work(&chip->work, HZ / 10);
-}
-
-static unsigned int external_rate(unsigned char rcs1)
-{
-	switch (rcs1 & (AK4114_FS0|AK4114_FS1|AK4114_FS2|AK4114_FS3)) {
-	case AK4114_FS_32000HZ: return 32000;
-	case AK4114_FS_44100HZ: return 44100;
-	case AK4114_FS_48000HZ: return 48000;
-	case AK4114_FS_88200HZ: return 88200;
-	case AK4114_FS_96000HZ: return 96000;
-	case AK4114_FS_176400HZ: return 176400;
-	case AK4114_FS_192000HZ: return 192000;
-	default:		return 0;
-	}
-}
-
-static int snd_ak4114_in_error_info(struct snd_kcontrol *kcontrol,
-				    struct snd_ctl_elem_info *uinfo)
-{
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-	uinfo->count = 1;
-	uinfo->value.integer.min = 0;
-	uinfo->value.integer.max = LONG_MAX;
-	return 0;
-}
-
-static int snd_ak4114_in_error_get(struct snd_kcontrol *kcontrol,
-				   struct snd_ctl_elem_value *ucontrol)
-{
-	struct ak4114 *chip = snd_kcontrol_chip(kcontrol);
-	long *ptr;
-
-	spin_lock_irq(&chip->lock);
-	ptr = (long *)(((char *)chip) + kcontrol->private_value);
-	ucontrol->value.integer.value[0] = *ptr;
-	*ptr = 0;
-	spin_unlock_irq(&chip->lock);
-	return 0;
-}
-
-#define snd_ak4114_in_bit_info		snd_ctl_boolean_mono_info
-
-static int snd_ak4114_in_bit_get(struct snd_kcontrol *kcontrol,
-				 struct snd_ctl_elem_value *ucontrol)
-{
-	struct ak4114 *chip = snd_kcontrol_chip(kcontrol);
-	unsigned char reg = kcontrol->private_value & 0xff;
-	unsigned char bit = (kcontrol->private_value >> 8) & 0xff;
-	unsigned char inv = (kcontrol->private_value >> 31) & 1;
-
-	ucontrol->value.integer.value[0] = ((reg_read(chip, reg) & (1 << bit)) ? 1 : 0) ^ inv;
-	return 0;
-}
-
-static int snd_ak4114_rate_info(struct snd_kcontrol *kcontrol,
-				struct snd_ctl_elem_info *uinfo)
-{
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-	uinfo->count = 1;
-	uinfo->value.integer.min = 0;
-	uinfo->value.integer.max = 192000;
-	return 0;
-}
-
-static int snd_ak4114_rate_get(struct snd_kcontrol *kcontrol,
-			       struct snd_ctl_elem_value *ucontrol)
-{
-	struct ak4114 *chip = snd_kcontrol_chip(kcontrol);
-
-	ucontrol->value.integer.value[0] = external_rate(reg_read(chip, AK4114_REG_RCS1));
-	return 0;
-}
-
-static int snd_ak4114_spdif_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
-	uinfo->count = 1;
-	return 0;
-}
-
-static int snd_ak4114_spdif_get(struct snd_kcontrol *kcontrol,
-				struct snd_ctl_elem_value *ucontrol)
-{
-	struct ak4114 *chip = snd_kcontrol_chip(kcontrol);
-	unsigned i;
-
-	for (i = 0; i < AK4114_REG_RXCSB_SIZE; i++)
-		ucontrol->value.iec958.status[i] = reg_read(chip, AK4114_REG_RXCSB0 + i);
-	return 0;
-}
-
-static int snd_ak4114_spdif_playback_get(struct snd_kcontrol *kcontrol,
-					 struct snd_ctl_elem_value *ucontrol)
-{
-	struct ak4114 *chip = snd_kcontrol_chip(kcontrol);
-	unsigned i;
-
-	for (i = 0; i < AK4114_REG_TXCSB_SIZE; i++)
-		ucontrol->value.iec958.status[i] = chip->txcsb[i];
-	return 0;
-}
-
-static int snd_ak4114_spdif_playback_put(struct snd_kcontrol *kcontrol,
-					 struct snd_ctl_elem_value *ucontrol)
-{
-	struct ak4114 *chip = snd_kcontrol_chip(kcontrol);
-	unsigned i;
-
-	for (i = 0; i < AK4114_REG_TXCSB_SIZE; i++)
-		reg_write(chip, AK4114_REG_TXCSB0 + i, ucontrol->value.iec958.status[i]);
-	return 0;
-}
-
-static int snd_ak4114_spdif_mask_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
-	uinfo->count = 1;
-	return 0;
-}
-
-static int snd_ak4114_spdif_mask_get(struct snd_kcontrol *kcontrol,
-				      struct snd_ctl_elem_value *ucontrol)
-{
-	memset(ucontrol->value.iec958.status, 0xff, AK4114_REG_RXCSB_SIZE);
-	return 0;
-}
-
-static int snd_ak4114_spdif_pinfo(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-	uinfo->value.integer.min = 0;
-	uinfo->value.integer.max = 0xffff;
-	uinfo->count = 4;
-	return 0;
-}
-
-static int snd_ak4114_spdif_pget(struct snd_kcontrol *kcontrol,
-				 struct snd_ctl_elem_value *ucontrol)
-{
-	struct ak4114 *chip = snd_kcontrol_chip(kcontrol);
-	unsigned short tmp;
-
-	ucontrol->value.integer.value[0] = 0xf8f2;
-	ucontrol->value.integer.value[1] = 0x4e1f;
-	tmp = reg_read(chip, AK4114_REG_Pc0) | (reg_read(chip, AK4114_REG_Pc1) << 8);
-	ucontrol->value.integer.value[2] = tmp;
-	tmp = reg_read(chip, AK4114_REG_Pd0) | (reg_read(chip, AK4114_REG_Pd1) << 8);
-	ucontrol->value.integer.value[3] = tmp;
-	return 0;
-}
-
-static int snd_ak4114_spdif_qinfo(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES;
-	uinfo->count = AK4114_REG_QSUB_SIZE;
-	return 0;
-}
-
-static int snd_ak4114_spdif_qget(struct snd_kcontrol *kcontrol,
-				 struct snd_ctl_elem_value *ucontrol)
-{
-	struct ak4114 *chip = snd_kcontrol_chip(kcontrol);
-	unsigned i;
-
-	for (i = 0; i < AK4114_REG_QSUB_SIZE; i++)
-		ucontrol->value.bytes.data[i] = reg_read(chip, AK4114_REG_QSUB_ADDR + i);
-	return 0;
-}
-
-/* Don't forget to change AK4114_CONTROLS define!!! */
-static struct snd_kcontrol_new snd_ak4114_iec958_controls[] = {
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 Parity Errors",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4114_in_error_info,
-	.get =		snd_ak4114_in_error_get,
-	.private_value = offsetof(struct ak4114, parity_errors),
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 V-Bit Errors",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4114_in_error_info,
-	.get =		snd_ak4114_in_error_get,
-	.private_value = offsetof(struct ak4114, v_bit_errors),
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 C-CRC Errors",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4114_in_error_info,
-	.get =		snd_ak4114_in_error_get,
-	.private_value = offsetof(struct ak4114, ccrc_errors),
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 Q-CRC Errors",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4114_in_error_info,
-	.get =		snd_ak4114_in_error_get,
-	.private_value = offsetof(struct ak4114, qcrc_errors),
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 External Rate",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4114_rate_info,
-	.get =		snd_ak4114_rate_get,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK),
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ,
-	.info =		snd_ak4114_spdif_mask_info,
-	.get =		snd_ak4114_spdif_mask_get,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4114_spdif_info,
-	.get =		snd_ak4114_spdif_playback_get,
-	.put =		snd_ak4114_spdif_playback_put,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		SNDRV_CTL_NAME_IEC958("",CAPTURE,MASK),
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ,
-	.info =		snd_ak4114_spdif_mask_info,
-	.get =		snd_ak4114_spdif_mask_get,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		SNDRV_CTL_NAME_IEC958("",CAPTURE,DEFAULT),
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4114_spdif_info,
-	.get =		snd_ak4114_spdif_get,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 Preample Capture Default",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4114_spdif_pinfo,
-	.get =		snd_ak4114_spdif_pget,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 Q-subcode Capture Default",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4114_spdif_qinfo,
-	.get =		snd_ak4114_spdif_qget,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 Audio",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4114_in_bit_info,
-	.get =		snd_ak4114_in_bit_get,
-	.private_value = (1<<31) | (1<<8) | AK4114_REG_RCS0,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 Non-PCM Bitstream",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4114_in_bit_info,
-	.get =		snd_ak4114_in_bit_get,
-	.private_value = (6<<8) | AK4114_REG_RCS0,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 DTS Bitstream",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4114_in_bit_info,
-	.get =		snd_ak4114_in_bit_get,
-	.private_value = (3<<8) | AK4114_REG_RCS0,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 PPL Lock Status",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4114_in_bit_info,
-	.get =		snd_ak4114_in_bit_get,
-	.private_value = (1<<31) | (4<<8) | AK4114_REG_RCS0,
-}
-};
-
-
-static void snd_ak4114_proc_regs_read(struct snd_info_entry *entry,
-		struct snd_info_buffer *buffer)
-{
-	struct ak4114 *ak4114 = entry->private_data;
-	int reg, val;
-	/* all ak4114 registers 0x00 - 0x1f */
-	for (reg = 0; reg < 0x20; reg++) {
-		val = reg_read(ak4114, reg);
-		snd_iprintf(buffer, "0x%02x = 0x%02x\n", reg, val);
-	}
-}
-
-static void snd_ak4114_proc_init(struct ak4114 *ak4114)
-{
-	struct snd_info_entry *entry;
-	if (!snd_card_proc_new(ak4114->card, "ak4114", &entry))
-		snd_info_set_text_ops(entry, ak4114, snd_ak4114_proc_regs_read);
-}
-
-int snd_ak4114_build(struct ak4114 *ak4114,
-		     struct snd_pcm_substream *ply_substream,
-		     struct snd_pcm_substream *cap_substream)
-{
-	struct snd_kcontrol *kctl;
-	unsigned int idx;
-	int err;
-
-	if (snd_BUG_ON(!cap_substream))
-		return -EINVAL;
-	ak4114->playback_substream = ply_substream;
-	ak4114->capture_substream = cap_substream;
-	for (idx = 0; idx < AK4114_CONTROLS; idx++) {
-		kctl = snd_ctl_new1(&snd_ak4114_iec958_controls[idx], ak4114);
-		if (kctl == NULL)
-			return -ENOMEM;
-		if (strstr(kctl->id.name, "Playback")) {
-			if (ply_substream == NULL) {
-				snd_ctl_free_one(kctl);
-				ak4114->kctls[idx] = NULL;
-				continue;
-			}
-			kctl->id.device = ply_substream->pcm->device;
-			kctl->id.subdevice = ply_substream->number;
-		} else {
-			kctl->id.device = cap_substream->pcm->device;
-			kctl->id.subdevice = cap_substream->number;
-		}
-		err = snd_ctl_add(ak4114->card, kctl);
-		if (err < 0)
-			return err;
-		ak4114->kctls[idx] = kctl;
-	}
-	snd_ak4114_proc_init(ak4114);
-	/* trigger workq */
-	schedule_delayed_work(&ak4114->work, HZ / 10);
-	return 0;
-}
-
-/* notify kcontrols if any parameters are changed */
-static void ak4114_notify(struct ak4114 *ak4114,
-			  unsigned char rcs0, unsigned char rcs1,
-			  unsigned char c0, unsigned char c1)
-{
-	if (!ak4114->kctls[0])
-		return;
-
-	if (rcs0 & AK4114_PAR)
-		snd_ctl_notify(ak4114->card, SNDRV_CTL_EVENT_MASK_VALUE,
-			       &ak4114->kctls[0]->id);
-	if (rcs0 & AK4114_V)
-		snd_ctl_notify(ak4114->card, SNDRV_CTL_EVENT_MASK_VALUE,
-			       &ak4114->kctls[1]->id);
-	if (rcs1 & AK4114_CCRC)
-		snd_ctl_notify(ak4114->card, SNDRV_CTL_EVENT_MASK_VALUE,
-			       &ak4114->kctls[2]->id);
-	if (rcs1 & AK4114_QCRC)
-		snd_ctl_notify(ak4114->card, SNDRV_CTL_EVENT_MASK_VALUE,
-			       &ak4114->kctls[3]->id);
-
-	/* rate change */
-	if (c1 & 0xf0)
-		snd_ctl_notify(ak4114->card, SNDRV_CTL_EVENT_MASK_VALUE,
-			       &ak4114->kctls[4]->id);
-
-	if ((c0 & AK4114_PEM) | (c0 & AK4114_CINT))
-		snd_ctl_notify(ak4114->card, SNDRV_CTL_EVENT_MASK_VALUE,
-			       &ak4114->kctls[9]->id);
-	if (c0 & AK4114_QINT)
-		snd_ctl_notify(ak4114->card, SNDRV_CTL_EVENT_MASK_VALUE,
-			       &ak4114->kctls[10]->id);
-
-	if (c0 & AK4114_AUDION)
-		snd_ctl_notify(ak4114->card, SNDRV_CTL_EVENT_MASK_VALUE,
-			       &ak4114->kctls[11]->id);
-	if (c0 & AK4114_AUTO)
-		snd_ctl_notify(ak4114->card, SNDRV_CTL_EVENT_MASK_VALUE,
-			       &ak4114->kctls[12]->id);
-	if (c0 & AK4114_DTSCD)
-		snd_ctl_notify(ak4114->card, SNDRV_CTL_EVENT_MASK_VALUE,
-			       &ak4114->kctls[13]->id);
-	if (c0 & AK4114_UNLCK)
-		snd_ctl_notify(ak4114->card, SNDRV_CTL_EVENT_MASK_VALUE,
-			       &ak4114->kctls[14]->id);
-}
-
-int snd_ak4114_external_rate(struct ak4114 *ak4114)
-{
-	unsigned char rcs1;
-
-	rcs1 = reg_read(ak4114, AK4114_REG_RCS1);
-	return external_rate(rcs1);
-}
-
-int snd_ak4114_check_rate_and_errors(struct ak4114 *ak4114, unsigned int flags)
-{
-	struct snd_pcm_runtime *runtime = ak4114->capture_substream ? ak4114->capture_substream->runtime : NULL;
-	unsigned long _flags;
-	int res = 0;
-	unsigned char rcs0, rcs1;
-	unsigned char c0, c1;
-
-	rcs1 = reg_read(ak4114, AK4114_REG_RCS1);
-	if (flags & AK4114_CHECK_NO_STAT)
-		goto __rate;
-	rcs0 = reg_read(ak4114, AK4114_REG_RCS0);
-	spin_lock_irqsave(&ak4114->lock, _flags);
-	if (rcs0 & AK4114_PAR)
-		ak4114->parity_errors++;
-	if (rcs1 & AK4114_V)
-		ak4114->v_bit_errors++;
-	if (rcs1 & AK4114_CCRC)
-		ak4114->ccrc_errors++;
-	if (rcs1 & AK4114_QCRC)
-		ak4114->qcrc_errors++;
-	c0 = (ak4114->rcs0 & (AK4114_QINT | AK4114_CINT | AK4114_PEM | AK4114_AUDION | AK4114_AUTO | AK4114_UNLCK)) ^
-                     (rcs0 & (AK4114_QINT | AK4114_CINT | AK4114_PEM | AK4114_AUDION | AK4114_AUTO | AK4114_UNLCK));
-	c1 = (ak4114->rcs1 & 0xf0) ^ (rcs1 & 0xf0);
-	ak4114->rcs0 = rcs0 & ~(AK4114_QINT | AK4114_CINT);
-	ak4114->rcs1 = rcs1;
-	spin_unlock_irqrestore(&ak4114->lock, _flags);
-
-	ak4114_notify(ak4114, rcs0, rcs1, c0, c1);
-	if (ak4114->change_callback && (c0 | c1) != 0)
-		ak4114->change_callback(ak4114, c0, c1);
-
-      __rate:
-	/* compare rate */
-	res = external_rate(rcs1);
-	if (!(flags & AK4114_CHECK_NO_RATE) && runtime && runtime->rate != res) {
-		snd_pcm_stream_lock_irqsave(ak4114->capture_substream, _flags);
-		if (snd_pcm_running(ak4114->capture_substream)) {
-			// printk(KERN_DEBUG "rate changed (%i <- %i)\n", runtime->rate, res);
-			snd_pcm_stop(ak4114->capture_substream, SNDRV_PCM_STATE_DRAINING);
-			res = 1;
-		}
-		snd_pcm_stream_unlock_irqrestore(ak4114->capture_substream, _flags);
-	}
-	return res;
-}
-
-static void ak4114_stats(struct work_struct *work)
-{
-	struct ak4114 *chip = container_of(work, struct ak4114, work.work);
-
-	if (!chip->init)
-		snd_ak4114_check_rate_and_errors(chip, chip->check_flags);
-
-	schedule_delayed_work(&chip->work, HZ / 10);
-}
-
-EXPORT_SYMBOL(snd_ak4114_create);
-EXPORT_SYMBOL(snd_ak4114_reg_write);
-EXPORT_SYMBOL(snd_ak4114_reinit);
-EXPORT_SYMBOL(snd_ak4114_build);
-EXPORT_SYMBOL(snd_ak4114_external_rate);
-EXPORT_SYMBOL(snd_ak4114_check_rate_and_errors);
diff --git a/ANDROID_3.4.5/sound/i2c/other/ak4117.c b/ANDROID_3.4.5/sound/i2c/other/ak4117.c
deleted file mode 100644
index b4b2a51f..00000000
--- a/ANDROID_3.4.5/sound/i2c/other/ak4117.c
+++ /dev/null
@@ -1,552 +0,0 @@
-/*
- *  Routines for control of the AK4117 via 4-wire serial interface
- *  IEC958 (S/PDIF) receiver by Asahi Kasei
- *  Copyright (c) by 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 <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/module.h>
-#include <sound/core.h>
-#include <sound/control.h>
-#include <sound/pcm.h>
-#include <sound/ak4117.h>
-#include <sound/asoundef.h>
-
-MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
-MODULE_DESCRIPTION("AK4117 IEC958 (S/PDIF) receiver by Asahi Kasei");
-MODULE_LICENSE("GPL");
-
-#define AK4117_ADDR			0x00 /* fixed address */
-
-static void snd_ak4117_timer(unsigned long data);
-
-static void reg_write(struct ak4117 *ak4117, unsigned char reg, unsigned char val)
-{
-	ak4117->write(ak4117->private_data, reg, val);
-	if (reg < sizeof(ak4117->regmap))
-		ak4117->regmap[reg] = val;
-}
-
-static inline unsigned char reg_read(struct ak4117 *ak4117, unsigned char reg)
-{
-	return ak4117->read(ak4117->private_data, reg);
-}
-
-#if 0
-static void reg_dump(struct ak4117 *ak4117)
-{
-	int i;
-
-	printk(KERN_DEBUG "AK4117 REG DUMP:\n");
-	for (i = 0; i < 0x1b; i++)
-		printk(KERN_DEBUG "reg[%02x] = %02x (%02x)\n", i, reg_read(ak4117, i), i < sizeof(ak4117->regmap) ? ak4117->regmap[i] : 0);
-}
-#endif
-
-static void snd_ak4117_free(struct ak4117 *chip)
-{
-	del_timer(&chip->timer);
-	kfree(chip);
-}
-
-static int snd_ak4117_dev_free(struct snd_device *device)
-{
-	struct ak4117 *chip = device->device_data;
-	snd_ak4117_free(chip);
-	return 0;
-}
-
-int snd_ak4117_create(struct snd_card *card, ak4117_read_t *read, ak4117_write_t *write,
-		      const unsigned char pgm[5], void *private_data, struct ak4117 **r_ak4117)
-{
-	struct ak4117 *chip;
-	int err = 0;
-	unsigned char reg;
-	static struct snd_device_ops ops = {
-		.dev_free =     snd_ak4117_dev_free,
-	};
-
-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);
-	if (chip == NULL)
-		return -ENOMEM;
-	spin_lock_init(&chip->lock);
-	chip->card = card;
-	chip->read = read;
-	chip->write = write;
-	chip->private_data = private_data;
-	init_timer(&chip->timer);
-	chip->timer.data = (unsigned long)chip;
-	chip->timer.function = snd_ak4117_timer;
-
-	for (reg = 0; reg < 5; reg++)
-		chip->regmap[reg] = pgm[reg];
-	snd_ak4117_reinit(chip);
-
-	chip->rcs0 = reg_read(chip, AK4117_REG_RCS0) & ~(AK4117_QINT | AK4117_CINT | AK4117_STC);
-	chip->rcs1 = reg_read(chip, AK4117_REG_RCS1);
-	chip->rcs2 = reg_read(chip, AK4117_REG_RCS2);
-
-	if ((err = snd_device_new(card, SNDRV_DEV_CODEC, chip, &ops)) < 0)
-		goto __fail;
-
-	if (r_ak4117)
-		*r_ak4117 = chip;
-	return 0;
-
-      __fail:
-	snd_ak4117_free(chip);
-	return err < 0 ? err : -EIO;
-}
-
-void snd_ak4117_reg_write(struct ak4117 *chip, unsigned char reg, unsigned char mask, unsigned char val)
-{
-	if (reg >= 5)
-		return;
-	reg_write(chip, reg, (chip->regmap[reg] & ~mask) | val);
-}
-
-void snd_ak4117_reinit(struct ak4117 *chip)
-{
-	unsigned char old = chip->regmap[AK4117_REG_PWRDN], reg;
-
-	del_timer(&chip->timer);
-	chip->init = 1;
-	/* bring the chip to reset state and powerdown state */
-	reg_write(chip, AK4117_REG_PWRDN, 0);
-	udelay(200);
-	/* release reset, but leave powerdown */
-	reg_write(chip, AK4117_REG_PWRDN, (old | AK4117_RST) & ~AK4117_PWN);
-	udelay(200);
-	for (reg = 1; reg < 5; reg++)
-		reg_write(chip, reg, chip->regmap[reg]);
-	/* release powerdown, everything is initialized now */
-	reg_write(chip, AK4117_REG_PWRDN, old | AK4117_RST | AK4117_PWN);
-	chip->init = 0;
-	chip->timer.expires = 1 + jiffies;
-	add_timer(&chip->timer);
-}
-
-static unsigned int external_rate(unsigned char rcs1)
-{
-	switch (rcs1 & (AK4117_FS0|AK4117_FS1|AK4117_FS2|AK4117_FS3)) {
-	case AK4117_FS_32000HZ: return 32000;
-	case AK4117_FS_44100HZ: return 44100;
-	case AK4117_FS_48000HZ: return 48000;
-	case AK4117_FS_88200HZ: return 88200;
-	case AK4117_FS_96000HZ: return 96000;
-	case AK4117_FS_176400HZ: return 176400;
-	case AK4117_FS_192000HZ: return 192000;
-	default:		return 0;
-	}
-}
-
-static int snd_ak4117_in_error_info(struct snd_kcontrol *kcontrol,
-				    struct snd_ctl_elem_info *uinfo)
-{
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-	uinfo->count = 1;
-	uinfo->value.integer.min = 0;
-	uinfo->value.integer.max = LONG_MAX;
-	return 0;
-}
-
-static int snd_ak4117_in_error_get(struct snd_kcontrol *kcontrol,
-				   struct snd_ctl_elem_value *ucontrol)
-{
-	struct ak4117 *chip = snd_kcontrol_chip(kcontrol);
-	long *ptr;
-
-	spin_lock_irq(&chip->lock);
-	ptr = (long *)(((char *)chip) + kcontrol->private_value);
-	ucontrol->value.integer.value[0] = *ptr;
-	*ptr = 0;
-	spin_unlock_irq(&chip->lock);
-	return 0;
-}
-
-#define snd_ak4117_in_bit_info		snd_ctl_boolean_mono_info
-
-static int snd_ak4117_in_bit_get(struct snd_kcontrol *kcontrol,
-				 struct snd_ctl_elem_value *ucontrol)
-{
-	struct ak4117 *chip = snd_kcontrol_chip(kcontrol);
-	unsigned char reg = kcontrol->private_value & 0xff;
-	unsigned char bit = (kcontrol->private_value >> 8) & 0xff;
-	unsigned char inv = (kcontrol->private_value >> 31) & 1;
-
-	ucontrol->value.integer.value[0] = ((reg_read(chip, reg) & (1 << bit)) ? 1 : 0) ^ inv;
-	return 0;
-}
-
-static int snd_ak4117_rx_info(struct snd_kcontrol *kcontrol,
-			      struct snd_ctl_elem_info *uinfo)
-{
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-	uinfo->count = 1;
-	uinfo->value.integer.min = 0;
-	uinfo->value.integer.max = 1;
-	return 0;
-}
-
-static int snd_ak4117_rx_get(struct snd_kcontrol *kcontrol,
-			     struct snd_ctl_elem_value *ucontrol)
-{
-	struct ak4117 *chip = snd_kcontrol_chip(kcontrol);
-
-	ucontrol->value.integer.value[0] = (chip->regmap[AK4117_REG_IO] & AK4117_IPS) ? 1 : 0;
-	return 0;
-}
-
-static int snd_ak4117_rx_put(struct snd_kcontrol *kcontrol,
-			     struct snd_ctl_elem_value *ucontrol)
-{
-	struct ak4117 *chip = snd_kcontrol_chip(kcontrol);
-	int change;
-	u8 old_val;
-	
-	spin_lock_irq(&chip->lock);
-	old_val = chip->regmap[AK4117_REG_IO];
-	change = !!ucontrol->value.integer.value[0] != ((old_val & AK4117_IPS) ? 1 : 0);
-	if (change)
-		reg_write(chip, AK4117_REG_IO, (old_val & ~AK4117_IPS) | (ucontrol->value.integer.value[0] ? AK4117_IPS : 0));
-	spin_unlock_irq(&chip->lock);
-	return change;
-}
-
-static int snd_ak4117_rate_info(struct snd_kcontrol *kcontrol,
-				struct snd_ctl_elem_info *uinfo)
-{
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-	uinfo->count = 1;
-	uinfo->value.integer.min = 0;
-	uinfo->value.integer.max = 192000;
-	return 0;
-}
-
-static int snd_ak4117_rate_get(struct snd_kcontrol *kcontrol,
-			       struct snd_ctl_elem_value *ucontrol)
-{
-	struct ak4117 *chip = snd_kcontrol_chip(kcontrol);
-
-	ucontrol->value.integer.value[0] = external_rate(reg_read(chip, AK4117_REG_RCS1));
-	return 0;
-}
-
-static int snd_ak4117_spdif_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
-	uinfo->count = 1;
-	return 0;
-}
-
-static int snd_ak4117_spdif_get(struct snd_kcontrol *kcontrol,
-				struct snd_ctl_elem_value *ucontrol)
-{
-	struct ak4117 *chip = snd_kcontrol_chip(kcontrol);
-	unsigned i;
-
-	for (i = 0; i < AK4117_REG_RXCSB_SIZE; i++)
-		ucontrol->value.iec958.status[i] = reg_read(chip, AK4117_REG_RXCSB0 + i);
-	return 0;
-}
-
-static int snd_ak4117_spdif_mask_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
-	uinfo->count = 1;
-	return 0;
-}
-
-static int snd_ak4117_spdif_mask_get(struct snd_kcontrol *kcontrol,
-				      struct snd_ctl_elem_value *ucontrol)
-{
-	memset(ucontrol->value.iec958.status, 0xff, AK4117_REG_RXCSB_SIZE);
-	return 0;
-}
-
-static int snd_ak4117_spdif_pinfo(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-	uinfo->value.integer.min = 0;
-	uinfo->value.integer.max = 0xffff;
-	uinfo->count = 4;
-	return 0;
-}
-
-static int snd_ak4117_spdif_pget(struct snd_kcontrol *kcontrol,
-				 struct snd_ctl_elem_value *ucontrol)
-{
-	struct ak4117 *chip = snd_kcontrol_chip(kcontrol);
-	unsigned short tmp;
-
-	ucontrol->value.integer.value[0] = 0xf8f2;
-	ucontrol->value.integer.value[1] = 0x4e1f;
-	tmp = reg_read(chip, AK4117_REG_Pc0) | (reg_read(chip, AK4117_REG_Pc1) << 8);
-	ucontrol->value.integer.value[2] = tmp;
-	tmp = reg_read(chip, AK4117_REG_Pd0) | (reg_read(chip, AK4117_REG_Pd1) << 8);
-	ucontrol->value.integer.value[3] = tmp;
-	return 0;
-}
-
-static int snd_ak4117_spdif_qinfo(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES;
-	uinfo->count = AK4117_REG_QSUB_SIZE;
-	return 0;
-}
-
-static int snd_ak4117_spdif_qget(struct snd_kcontrol *kcontrol,
-				 struct snd_ctl_elem_value *ucontrol)
-{
-	struct ak4117 *chip = snd_kcontrol_chip(kcontrol);
-	unsigned i;
-
-	for (i = 0; i < AK4117_REG_QSUB_SIZE; i++)
-		ucontrol->value.bytes.data[i] = reg_read(chip, AK4117_REG_QSUB_ADDR + i);
-	return 0;
-}
-
-/* Don't forget to change AK4117_CONTROLS define!!! */
-static struct snd_kcontrol_new snd_ak4117_iec958_controls[] = {
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 Parity Errors",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4117_in_error_info,
-	.get =		snd_ak4117_in_error_get,
-	.private_value = offsetof(struct ak4117, parity_errors),
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 V-Bit Errors",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4117_in_error_info,
-	.get =		snd_ak4117_in_error_get,
-	.private_value = offsetof(struct ak4117, v_bit_errors),
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 C-CRC Errors",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4117_in_error_info,
-	.get =		snd_ak4117_in_error_get,
-	.private_value = offsetof(struct ak4117, ccrc_errors),
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 Q-CRC Errors",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4117_in_error_info,
-	.get =		snd_ak4117_in_error_get,
-	.private_value = offsetof(struct ak4117, qcrc_errors),
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 External Rate",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4117_rate_info,
-	.get =		snd_ak4117_rate_get,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		SNDRV_CTL_NAME_IEC958("",CAPTURE,MASK),
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ,
-	.info =		snd_ak4117_spdif_mask_info,
-	.get =		snd_ak4117_spdif_mask_get,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		SNDRV_CTL_NAME_IEC958("",CAPTURE,DEFAULT),
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4117_spdif_info,
-	.get =		snd_ak4117_spdif_get,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 Preample Capture Default",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4117_spdif_pinfo,
-	.get =		snd_ak4117_spdif_pget,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 Q-subcode Capture Default",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4117_spdif_qinfo,
-	.get =		snd_ak4117_spdif_qget,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 Audio",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4117_in_bit_info,
-	.get =		snd_ak4117_in_bit_get,
-	.private_value = (1<<31) | (3<<8) | AK4117_REG_RCS0,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 Non-PCM Bitstream",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4117_in_bit_info,
-	.get =		snd_ak4117_in_bit_get,
-	.private_value = (5<<8) | AK4117_REG_RCS1,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"IEC958 DTS Bitstream",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info =		snd_ak4117_in_bit_info,
-	.get =		snd_ak4117_in_bit_get,
-	.private_value = (6<<8) | AK4117_REG_RCS1,
-},
-{
-	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =		"AK4117 Input Select",
-	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE,
-	.info =		snd_ak4117_rx_info,
-	.get =		snd_ak4117_rx_get,
-	.put =		snd_ak4117_rx_put,
-}
-};
-
-int snd_ak4117_build(struct ak4117 *ak4117, struct snd_pcm_substream *cap_substream)
-{
-	struct snd_kcontrol *kctl;
-	unsigned int idx;
-	int err;
-
-	if (snd_BUG_ON(!cap_substream))
-		return -EINVAL;
-	ak4117->substream = cap_substream;
-	for (idx = 0; idx < AK4117_CONTROLS; idx++) {
-		kctl = snd_ctl_new1(&snd_ak4117_iec958_controls[idx], ak4117);
-		if (kctl == NULL)
-			return -ENOMEM;
-		kctl->id.device = cap_substream->pcm->device;
-		kctl->id.subdevice = cap_substream->number;
-		err = snd_ctl_add(ak4117->card, kctl);
-		if (err < 0)
-			return err;
-		ak4117->kctls[idx] = kctl;
-	}
-	return 0;
-}
-
-int snd_ak4117_external_rate(struct ak4117 *ak4117)
-{
-	unsigned char rcs1;
-
-	rcs1 = reg_read(ak4117, AK4117_REG_RCS1);
-	return external_rate(rcs1);
-}
-
-int snd_ak4117_check_rate_and_errors(struct ak4117 *ak4117, unsigned int flags)
-{
-	struct snd_pcm_runtime *runtime = ak4117->substream ? ak4117->substream->runtime : NULL;
-	unsigned long _flags;
-	int res = 0;
-	unsigned char rcs0, rcs1, rcs2;
-	unsigned char c0, c1;
-
-	rcs1 = reg_read(ak4117, AK4117_REG_RCS1);
-	if (flags & AK4117_CHECK_NO_STAT)
-		goto __rate;
-	rcs0 = reg_read(ak4117, AK4117_REG_RCS0);
-	rcs2 = reg_read(ak4117, AK4117_REG_RCS2);
-	// printk(KERN_DEBUG "AK IRQ: rcs0 = 0x%x, rcs1 = 0x%x, rcs2 = 0x%x\n", rcs0, rcs1, rcs2);
-	spin_lock_irqsave(&ak4117->lock, _flags);
-	if (rcs0 & AK4117_PAR)
-		ak4117->parity_errors++;
-	if (rcs0 & AK4117_V)
-		ak4117->v_bit_errors++;
-	if (rcs2 & AK4117_CCRC)
-		ak4117->ccrc_errors++;
-	if (rcs2 & AK4117_QCRC)
-		ak4117->qcrc_errors++;
-	c0 = (ak4117->rcs0 & (AK4117_QINT | AK4117_CINT | AK4117_STC | AK4117_AUDION | AK4117_AUTO | AK4117_UNLCK)) ^
-                     (rcs0 & (AK4117_QINT | AK4117_CINT | AK4117_STC | AK4117_AUDION | AK4117_AUTO | AK4117_UNLCK));
-	c1 = (ak4117->rcs1 & (AK4117_DTSCD | AK4117_NPCM | AK4117_PEM | 0x0f)) ^
-	             (rcs1 & (AK4117_DTSCD | AK4117_NPCM | AK4117_PEM | 0x0f));
-	ak4117->rcs0 = rcs0 & ~(AK4117_QINT | AK4117_CINT | AK4117_STC);
-	ak4117->rcs1 = rcs1;
-	ak4117->rcs2 = rcs2;
-	spin_unlock_irqrestore(&ak4117->lock, _flags);
-
-	if (rcs0 & AK4117_PAR)
-		snd_ctl_notify(ak4117->card, SNDRV_CTL_EVENT_MASK_VALUE, &ak4117->kctls[0]->id);
-	if (rcs0 & AK4117_V)
-		snd_ctl_notify(ak4117->card, SNDRV_CTL_EVENT_MASK_VALUE, &ak4117->kctls[1]->id);
-	if (rcs2 & AK4117_CCRC)
-		snd_ctl_notify(ak4117->card, SNDRV_CTL_EVENT_MASK_VALUE, &ak4117->kctls[2]->id);
-	if (rcs2 & AK4117_QCRC)
-		snd_ctl_notify(ak4117->card, SNDRV_CTL_EVENT_MASK_VALUE, &ak4117->kctls[3]->id);
-
-	/* rate change */
-	if (c1 & 0x0f)
-		snd_ctl_notify(ak4117->card, SNDRV_CTL_EVENT_MASK_VALUE, &ak4117->kctls[4]->id);
-
-	if ((c1 & AK4117_PEM) | (c0 & AK4117_CINT))
-		snd_ctl_notify(ak4117->card, SNDRV_CTL_EVENT_MASK_VALUE, &ak4117->kctls[6]->id);
-	if (c0 & AK4117_QINT)
-		snd_ctl_notify(ak4117->card, SNDRV_CTL_EVENT_MASK_VALUE, &ak4117->kctls[8]->id);
-
-	if (c0 & AK4117_AUDION)
-		snd_ctl_notify(ak4117->card, SNDRV_CTL_EVENT_MASK_VALUE, &ak4117->kctls[9]->id);
-	if (c1 & AK4117_NPCM)
-		snd_ctl_notify(ak4117->card, SNDRV_CTL_EVENT_MASK_VALUE, &ak4117->kctls[10]->id);
-	if (c1 & AK4117_DTSCD)
-		snd_ctl_notify(ak4117->card, SNDRV_CTL_EVENT_MASK_VALUE, &ak4117->kctls[11]->id);
-		
-	if (ak4117->change_callback && (c0 | c1) != 0)
-		ak4117->change_callback(ak4117, c0, c1);
-
-      __rate:
-	/* compare rate */
-	res = external_rate(rcs1);
-	if (!(flags & AK4117_CHECK_NO_RATE) && runtime && runtime->rate != res) {
-		snd_pcm_stream_lock_irqsave(ak4117->substream, _flags);
-		if (snd_pcm_running(ak4117->substream)) {
-			// printk(KERN_DEBUG "rate changed (%i <- %i)\n", runtime->rate, res);
-			snd_pcm_stop(ak4117->substream, SNDRV_PCM_STATE_DRAINING);
-			wake_up(&runtime->sleep);
-			res = 1;
-		}
-		snd_pcm_stream_unlock_irqrestore(ak4117->substream, _flags);
-	}
-	return res;
-}
-
-static void snd_ak4117_timer(unsigned long data)
-{
-	struct ak4117 *chip = (struct ak4117 *)data;
-
-	if (chip->init)
-		return;
-	snd_ak4117_check_rate_and_errors(chip, 0);
-	chip->timer.expires = 1 + jiffies;
-	add_timer(&chip->timer);
-}
-
-EXPORT_SYMBOL(snd_ak4117_create);
-EXPORT_SYMBOL(snd_ak4117_reg_write);
-EXPORT_SYMBOL(snd_ak4117_reinit);
-EXPORT_SYMBOL(snd_ak4117_build);
-EXPORT_SYMBOL(snd_ak4117_external_rate);
-EXPORT_SYMBOL(snd_ak4117_check_rate_and_errors);
diff --git a/ANDROID_3.4.5/sound/i2c/other/ak4xxx-adda.c b/ANDROID_3.4.5/sound/i2c/other/ak4xxx-adda.c
deleted file mode 100644
index cef813d2..00000000
--- a/ANDROID_3.4.5/sound/i2c/other/ak4xxx-adda.c
+++ /dev/null
@@ -1,945 +0,0 @@
-/*
- *   ALSA driver for AK4524 / AK4528 / AK4529 / AK4355 / AK4358 / AK4381
- *   AD and DA converters
- *
- *	Copyright (c) 2000-2004 Jaroslav Kysela <perex@perex.cz>,
- *				Takashi Iwai <tiwai@suse.de>
- *
- *   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/module.h>
-#include <sound/core.h>
-#include <sound/control.h>
-#include <sound/tlv.h>
-#include <sound/ak4xxx-adda.h>
-#include <sound/info.h>
-
-MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>");
-MODULE_DESCRIPTION("Routines for control of AK452x / AK43xx  AD/DA converters");
-MODULE_LICENSE("GPL");
-
-/* write the given register and save the data to the cache */
-void snd_akm4xxx_write(struct snd_akm4xxx *ak, int chip, unsigned char reg,
-		       unsigned char val)
-{
-	ak->ops.lock(ak, chip);
-	ak->ops.write(ak, chip, reg, val);
-
-	/* save the data */
-	snd_akm4xxx_set(ak, chip, reg, val);
-	ak->ops.unlock(ak, chip);
-}
-
-EXPORT_SYMBOL(snd_akm4xxx_write);
-
-/* reset procedure for AK4524 and AK4528 */
-static void ak4524_reset(struct snd_akm4xxx *ak, int state)
-{
-	unsigned int chip;
-	unsigned char reg;
-
-	for (chip = 0; chip < ak->num_dacs/2; chip++) {
-		snd_akm4xxx_write(ak, chip, 0x01, state ? 0x00 : 0x03);
-		if (state)
-			continue;
-		/* DAC volumes */
-		for (reg = 0x04; reg < ak->total_regs; reg++)
-			snd_akm4xxx_write(ak, chip, reg,
-					  snd_akm4xxx_get(ak, chip, reg));
-	}
-}
-
-/* reset procedure for AK4355 and AK4358 */
-static void ak435X_reset(struct snd_akm4xxx *ak, int state)
-{
-	unsigned char reg;
-
-	if (state) {
-		snd_akm4xxx_write(ak, 0, 0x01, 0x02); /* reset and soft-mute */
-		return;
-	}
-	for (reg = 0x00; reg < ak->total_regs; 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 */
-}
-
-/* reset procedure for AK4381 */
-static void ak4381_reset(struct snd_akm4xxx *ak, int state)
-{
-	unsigned int chip;
-	unsigned char reg;
-	for (chip = 0; chip < ak->num_dacs/2; chip++) {
-		snd_akm4xxx_write(ak, chip, 0x00, state ? 0x0c : 0x0f);
-		if (state)
-			continue;
-		for (reg = 0x01; reg < ak->total_regs; reg++)
-			snd_akm4xxx_write(ak, chip, reg,
-					  snd_akm4xxx_get(ak, chip, reg));
-	}
-}
-
-/*
- * reset the AKM codecs
- * @state: 1 = reset codec, 0 = restore the registers
- *
- * assert the reset operation and restores the register values to the chips.
- */
-void snd_akm4xxx_reset(struct snd_akm4xxx *ak, int state)
-{
-	switch (ak->type) {
-	case SND_AK4524:
-	case SND_AK4528:
-	case SND_AK4620:
-		ak4524_reset(ak, state);
-		break;
-	case SND_AK4529:
-		/* FIXME: needed for ak4529? */
-		break;
-	case SND_AK4355:
-		ak435X_reset(ak, state);
-		break;
-	case SND_AK4358:
-		ak435X_reset(ak, state);
-		break;
-	case SND_AK4381:
-		ak4381_reset(ak, state);
-		break;
-	default:
-		break;
-	}
-}
-
-EXPORT_SYMBOL(snd_akm4xxx_reset);
-
-
-/*
- * Volume conversion table for non-linear volumes
- * from -63.5dB (mute) to 0dB step 0.5dB
- *
- * Used for AK4524/AK4620 input/ouput attenuation, AK4528, and
- * AK5365 input attenuation
- */
-static const unsigned char vol_cvt_datt[128] = {
-	0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04,
-	0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x06, 0x06,
-	0x06, 0x07, 0x07, 0x08, 0x08, 0x08, 0x09, 0x0a,
-	0x0a, 0x0b, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x0f,
-	0x10, 0x10, 0x11, 0x12, 0x12, 0x13, 0x13, 0x14,
-	0x15, 0x16, 0x17, 0x17, 0x18, 0x19, 0x1a, 0x1c,
-	0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x23,
-	0x24, 0x25, 0x26, 0x28, 0x29, 0x2a, 0x2b, 0x2d,
-	0x2e, 0x30, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35,
-	0x37, 0x38, 0x39, 0x3b, 0x3c, 0x3e, 0x3f, 0x40,
-	0x41, 0x42, 0x43, 0x44, 0x46, 0x47, 0x48, 0x4a,
-	0x4b, 0x4d, 0x4e, 0x50, 0x51, 0x52, 0x53, 0x54,
-	0x55, 0x56, 0x58, 0x59, 0x5b, 0x5c, 0x5e, 0x5f,
-	0x60, 0x61, 0x62, 0x64, 0x65, 0x66, 0x67, 0x69,
-	0x6a, 0x6c, 0x6d, 0x6f, 0x70, 0x71, 0x72, 0x73,
-	0x75, 0x76, 0x77, 0x79, 0x7a, 0x7c, 0x7d, 0x7f,
-};
-
-/*
- * dB tables
- */
-static const DECLARE_TLV_DB_SCALE(db_scale_vol_datt, -6350, 50, 1);
-static const DECLARE_TLV_DB_SCALE(db_scale_8bit, -12750, 50, 1);
-static const DECLARE_TLV_DB_SCALE(db_scale_7bit, -6350, 50, 1);
-static const DECLARE_TLV_DB_LINEAR(db_scale_linear, TLV_DB_GAIN_MUTE, 0);
-
-/*
- * initialize all the ak4xxx chips
- */
-void snd_akm4xxx_init(struct snd_akm4xxx *ak)
-{
-	static const unsigned char inits_ak4524[] = {
-		0x00, 0x07, /* 0: all power up */
-		0x01, 0x00, /* 1: ADC/DAC reset */
-		0x02, 0x60, /* 2: 24bit I2S */
-		0x03, 0x19, /* 3: deemphasis off */
-		0x01, 0x03, /* 1: ADC/DAC enable */
-		0x04, 0x00, /* 4: ADC left muted */
-		0x05, 0x00, /* 5: ADC right muted */
-		0x06, 0x00, /* 6: DAC left muted */
-		0x07, 0x00, /* 7: DAC right muted */
-		0xff, 0xff
-	};
-	static const unsigned char inits_ak4528[] = {
-		0x00, 0x07, /* 0: all power up */
-		0x01, 0x00, /* 1: ADC/DAC reset */
-		0x02, 0x60, /* 2: 24bit I2S */
-		0x03, 0x0d, /* 3: deemphasis off, turn LR highpass filters on */
-		0x01, 0x03, /* 1: ADC/DAC enable */
-		0x04, 0x00, /* 4: ADC left muted */
-		0x05, 0x00, /* 5: ADC right muted */
-		0xff, 0xff
-	};
-	static const unsigned char inits_ak4529[] = {
-		0x09, 0x01, /* 9: ATS=0, RSTN=1 */
-		0x0a, 0x3f, /* A: all power up, no zero/overflow detection */
-		0x00, 0x0c, /* 0: TDM=0, 24bit I2S, SMUTE=0 */
-		0x01, 0x00, /* 1: ACKS=0, ADC, loop off */
-		0x02, 0xff, /* 2: LOUT1 muted */
-		0x03, 0xff, /* 3: ROUT1 muted */
-		0x04, 0xff, /* 4: LOUT2 muted */
-		0x05, 0xff, /* 5: ROUT2 muted */
-		0x06, 0xff, /* 6: LOUT3 muted */
-		0x07, 0xff, /* 7: ROUT3 muted */
-		0x0b, 0xff, /* B: LOUT4 muted */
-		0x0c, 0xff, /* C: ROUT4 muted */
-		0x08, 0x55, /* 8: deemphasis all off */
-		0xff, 0xff
-	};
-	static const 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 */
-		0x06, 0x00, /* 6: LOUT2 volume muted */
-		0x07, 0x00, /* 7: ROUT2 volume muted */
-		0x08, 0x00, /* 8: LOUT3 volume muted */
-		0x09, 0x00, /* 9: ROUT3 volume muted */
-		0x0a, 0x00, /* a: DATT speed=0, ignore DZF */
-		0x01, 0x01, /* 1: un-reset, unmute */
-		0xff, 0xff
-	};
-	static const unsigned char inits_ak4358[] = {
-		0x01, 0x02, /* 1: reset and soft-mute */
-		0x00, 0x06, /* 0: mode3(i2s), disable auto-clock detect,
-			     * disable DZF, sharp roll-off, RSTN#=0 */
-		0x02, 0x4e, /* 2: DA's power up, normal speed, RSTN#=0 */
-		/* 0x02, 0x6e,*/ /* quad speed */
-		0x03, 0x01, /* 3: de-emphasis off */
-		0x04, 0x00, /* 4: LOUT1 volume muted */
-		0x05, 0x00, /* 5: ROUT1 volume muted */
-		0x06, 0x00, /* 6: LOUT2 volume muted */
-		0x07, 0x00, /* 7: ROUT2 volume muted */
-		0x08, 0x00, /* 8: LOUT3 volume muted */
-		0x09, 0x00, /* 9: ROUT3 volume muted */
-		0x0b, 0x00, /* b: LOUT4 volume muted */
-		0x0c, 0x00, /* c: ROUT4 volume muted */
-		0x0a, 0x00, /* a: DATT speed=0, ignore DZF */
-		0x01, 0x01, /* 1: un-reset, unmute */
-		0xff, 0xff
-	};
-	static const 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 */
-		0x00, 0x0f, /* 0: power-up, un-reset */
-		0xff, 0xff
-	};
-	static const unsigned char inits_ak4620[] = {
-		0x00, 0x07, /* 0: normal */
-		0x01, 0x00, /* 0: reset */
-		0x01, 0x02, /* 1: RSTAD */
-		0x01, 0x03, /* 1: RSTDA */
-		0x01, 0x0f, /* 1: normal */
-		0x02, 0x60, /* 2: 24bit I2S */
-		0x03, 0x01, /* 3: deemphasis off */
-		0x04, 0x00, /* 4: LIN muted */
-		0x05, 0x00, /* 5: RIN muted */
-		0x06, 0x00, /* 6: LOUT muted */
-		0x07, 0x00, /* 7: ROUT muted */
-		0xff, 0xff
-	};
-
-	int chip;
-	const unsigned char *ptr, *inits;
-	unsigned char reg, data;
-
-	memset(ak->images, 0, sizeof(ak->images));
-	memset(ak->volumes, 0, sizeof(ak->volumes));
-
-	switch (ak->type) {
-	case SND_AK4524:
-		inits = inits_ak4524;
-		ak->num_chips = ak->num_dacs / 2;
-		ak->name = "ak4524";
-		ak->total_regs = 0x08;
-		break;
-	case SND_AK4528:
-		inits = inits_ak4528;
-		ak->num_chips = ak->num_dacs / 2;
-		ak->name = "ak4528";
-		ak->total_regs = 0x06;
-		break;
-	case SND_AK4529:
-		inits = inits_ak4529;
-		ak->num_chips = 1;
-		ak->name = "ak4529";
-		ak->total_regs = 0x0d;
-		break;
-	case SND_AK4355:
-		inits = inits_ak4355;
-		ak->num_chips = 1;
-		ak->name = "ak4355";
-		ak->total_regs = 0x0b;
-		break;
-	case SND_AK4358:
-		inits = inits_ak4358;
-		ak->num_chips = 1;
-		ak->name = "ak4358";
-		ak->total_regs = 0x10;
-		break;
-	case SND_AK4381:
-		inits = inits_ak4381;
-		ak->num_chips = ak->num_dacs / 2;
-		ak->name = "ak4381";
-		ak->total_regs = 0x05;
-		break;
-	case SND_AK5365:
-		/* FIXME: any init sequence? */
-		ak->num_chips = 1;
-		ak->name = "ak5365";
-		ak->total_regs = 0x08;
-		return;
-	case SND_AK4620:
-		inits = inits_ak4620;
-		ak->num_chips = ak->num_dacs / 2;
-		ak->name = "ak4620";
-		ak->total_regs = 0x08;
-		break;
-	default:
-		snd_BUG();
-		return;
-	}
-
-	for (chip = 0; chip < ak->num_chips; chip++) {
-		ptr = inits;
-		while (*ptr != 0xff) {
-			reg = *ptr++;
-			data = *ptr++;
-			snd_akm4xxx_write(ak, chip, reg, data);
-			udelay(10);
-		}
-	}
-}
-
-EXPORT_SYMBOL(snd_akm4xxx_init);
-
-/*
- * Mixer callbacks
- */
-#define AK_IPGA 			(1<<20)	/* including IPGA */
-#define AK_VOL_CVT 			(1<<21)	/* need dB conversion */
-#define AK_NEEDSMSB 			(1<<22)	/* need MSB update bit */
-#define AK_INVERT 			(1<<23)	/* data is inverted */
-#define AK_GET_CHIP(val)		(((val) >> 8) & 0xff)
-#define AK_GET_ADDR(val)		((val) & 0xff)
-#define AK_GET_SHIFT(val)		(((val) >> 16) & 0x0f)
-#define AK_GET_VOL_CVT(val)		(((val) >> 21) & 1)
-#define AK_GET_IPGA(val)		(((val) >> 20) & 1)
-#define AK_GET_NEEDSMSB(val)		(((val) >> 22) & 1)
-#define AK_GET_INVERT(val)		(((val) >> 23) & 1)
-#define AK_GET_MASK(val)		(((val) >> 24) & 0xff)
-#define AK_COMPOSE(chip,addr,shift,mask) \
-	(((chip) << 8) | (addr) | ((shift) << 16) | ((mask) << 24))
-
-static int snd_akm4xxx_volume_info(struct snd_kcontrol *kcontrol,
-				   struct snd_ctl_elem_info *uinfo)
-{
-	unsigned int mask = AK_GET_MASK(kcontrol->private_value);
-
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-	uinfo->count = 1;
-	uinfo->value.integer.min = 0;
-	uinfo->value.integer.max = mask;
-	return 0;
-}
-
-static int snd_akm4xxx_volume_get(struct snd_kcontrol *kcontrol,
-				  struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_akm4xxx *ak = snd_kcontrol_chip(kcontrol);
-	int chip = AK_GET_CHIP(kcontrol->private_value);
-	int addr = AK_GET_ADDR(kcontrol->private_value);
-
-	ucontrol->value.integer.value[0] = snd_akm4xxx_get_vol(ak, chip, addr);
-	return 0;
-}
-
-static int put_ak_reg(struct snd_kcontrol *kcontrol, int addr,
-		      unsigned char nval)
-{
-	struct snd_akm4xxx *ak = snd_kcontrol_chip(kcontrol);
-	unsigned int mask = AK_GET_MASK(kcontrol->private_value);
-	int chip = AK_GET_CHIP(kcontrol->private_value);
-
-	if (snd_akm4xxx_get_vol(ak, chip, addr) == nval)
-		return 0;
-
-	snd_akm4xxx_set_vol(ak, chip, addr, nval);
-	if (AK_GET_VOL_CVT(kcontrol->private_value) && nval < 128)
-		nval = vol_cvt_datt[nval];
-	if (AK_GET_IPGA(kcontrol->private_value) && nval >= 128)
-		nval++; /* need to correct + 1 since both 127 and 128 are 0dB */
-	if (AK_GET_INVERT(kcontrol->private_value))
-		nval = mask - nval;
-	if (AK_GET_NEEDSMSB(kcontrol->private_value))
-		nval |= 0x80;
-	/* printk(KERN_DEBUG "DEBUG - AK writing reg: chip %x addr %x,
-	   nval %x\n", chip, addr, nval); */
-	snd_akm4xxx_write(ak, chip, addr, nval);
-	return 1;
-}
-
-static int snd_akm4xxx_volume_put(struct snd_kcontrol *kcontrol,
-				  struct snd_ctl_elem_value *ucontrol)
-{
-	unsigned int mask = AK_GET_MASK(kcontrol->private_value);
-	unsigned int val = ucontrol->value.integer.value[0];
-	if (val > mask)
-		return -EINVAL;
-	return put_ak_reg(kcontrol, AK_GET_ADDR(kcontrol->private_value), val);
-}
-
-static int snd_akm4xxx_stereo_volume_info(struct snd_kcontrol *kcontrol,
-					  struct snd_ctl_elem_info *uinfo)
-{
-	unsigned int mask = AK_GET_MASK(kcontrol->private_value);
-
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-	uinfo->count = 2;
-	uinfo->value.integer.min = 0;
-	uinfo->value.integer.max = mask;
-	return 0;
-}
-
-static int snd_akm4xxx_stereo_volume_get(struct snd_kcontrol *kcontrol,
-					 struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_akm4xxx *ak = snd_kcontrol_chip(kcontrol);
-	int chip = AK_GET_CHIP(kcontrol->private_value);
-	int addr = AK_GET_ADDR(kcontrol->private_value);
-
-	ucontrol->value.integer.value[0] = snd_akm4xxx_get_vol(ak, chip, addr);
-	ucontrol->value.integer.value[1] = snd_akm4xxx_get_vol(ak, chip, addr+1);
-	return 0;
-}
-
-static int snd_akm4xxx_stereo_volume_put(struct snd_kcontrol *kcontrol,
-					 struct snd_ctl_elem_value *ucontrol)
-{
-	int addr = AK_GET_ADDR(kcontrol->private_value);
-	unsigned int mask = AK_GET_MASK(kcontrol->private_value);
-	unsigned int val[2];
-	int change;
-
-	val[0] = ucontrol->value.integer.value[0];
-	val[1] = ucontrol->value.integer.value[1];
-	if (val[0] > mask || val[1] > mask)
-		return -EINVAL;
-	change = put_ak_reg(kcontrol, addr, val[0]);
-	change |= put_ak_reg(kcontrol, addr + 1, val[1]);
-	return change;
-}
-
-static int snd_akm4xxx_deemphasis_info(struct snd_kcontrol *kcontrol,
-				       struct snd_ctl_elem_info *uinfo)
-{
-	static char *texts[4] = {
-		"44.1kHz", "Off", "48kHz", "32kHz",
-	};
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-	uinfo->count = 1;
-	uinfo->value.enumerated.items = 4;
-	if (uinfo->value.enumerated.item >= 4)
-		uinfo->value.enumerated.item = 3;
-	strcpy(uinfo->value.enumerated.name,
-	       texts[uinfo->value.enumerated.item]);
-	return 0;
-}
-
-static int snd_akm4xxx_deemphasis_get(struct snd_kcontrol *kcontrol,
-				      struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_akm4xxx *ak = snd_kcontrol_chip(kcontrol);
-	int chip = AK_GET_CHIP(kcontrol->private_value);
-	int addr = AK_GET_ADDR(kcontrol->private_value);
-	int shift = AK_GET_SHIFT(kcontrol->private_value);
-	ucontrol->value.enumerated.item[0] =
-		(snd_akm4xxx_get(ak, chip, addr) >> shift) & 3;
-	return 0;
-}
-
-static int snd_akm4xxx_deemphasis_put(struct snd_kcontrol *kcontrol,
-				      struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_akm4xxx *ak = snd_kcontrol_chip(kcontrol);
-	int chip = AK_GET_CHIP(kcontrol->private_value);
-	int addr = AK_GET_ADDR(kcontrol->private_value);
-	int shift = AK_GET_SHIFT(kcontrol->private_value);
-	unsigned char nval = ucontrol->value.enumerated.item[0] & 3;
-	int change;
-	
-	nval = (nval << shift) |
-		(snd_akm4xxx_get(ak, chip, addr) & ~(3 << shift));
-	change = snd_akm4xxx_get(ak, chip, addr) != nval;
-	if (change)
-		snd_akm4xxx_write(ak, chip, addr, nval);
-	return change;
-}
-
-#define ak4xxx_switch_info	snd_ctl_boolean_mono_info
-
-static int ak4xxx_switch_get(struct snd_kcontrol *kcontrol,
-			     struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_akm4xxx *ak = snd_kcontrol_chip(kcontrol);
-	int chip = AK_GET_CHIP(kcontrol->private_value);
-	int addr = AK_GET_ADDR(kcontrol->private_value);
-	int shift = AK_GET_SHIFT(kcontrol->private_value);
-	int invert = AK_GET_INVERT(kcontrol->private_value);
-	/* we observe the (1<<shift) bit only */
-	unsigned char val = snd_akm4xxx_get(ak, chip, addr) & (1<<shift);
-	if (invert)
-		val = ! val;
-	ucontrol->value.integer.value[0] = (val & (1<<shift)) != 0;
-	return 0;
-}
-
-static int ak4xxx_switch_put(struct snd_kcontrol *kcontrol,
-			     struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_akm4xxx *ak = snd_kcontrol_chip(kcontrol);
-	int chip = AK_GET_CHIP(kcontrol->private_value);
-	int addr = AK_GET_ADDR(kcontrol->private_value);
-	int shift = AK_GET_SHIFT(kcontrol->private_value);
-	int invert = AK_GET_INVERT(kcontrol->private_value);
-	long flag = ucontrol->value.integer.value[0];
-	unsigned char val, oval;
-	int change;
-
-	if (invert)
-		flag = ! flag;
-	oval = snd_akm4xxx_get(ak, chip, addr);
-	if (flag)
-		val = oval | (1<<shift);
-	else
-		val = oval & ~(1<<shift);
-	change = (oval != val);
-	if (change)
-		snd_akm4xxx_write(ak, chip, addr, val);
-	return change;
-}
-
-#define AK5365_NUM_INPUTS 5
-
-static int ak4xxx_capture_num_inputs(struct snd_akm4xxx *ak, int mixer_ch)
-{
-	int num_names;
-	const char **input_names;
-
-	input_names = ak->adc_info[mixer_ch].input_names;
-	num_names = 0;
-	while (num_names < AK5365_NUM_INPUTS && input_names[num_names])
-		++num_names;
-	return num_names;
-}
-
-static int ak4xxx_capture_source_info(struct snd_kcontrol *kcontrol,
-				      struct snd_ctl_elem_info *uinfo)
-{
-	struct snd_akm4xxx *ak = snd_kcontrol_chip(kcontrol);
-	int mixer_ch = AK_GET_SHIFT(kcontrol->private_value);
-	const char **input_names;
-	int  num_names, idx;
-
-	num_names = ak4xxx_capture_num_inputs(ak, mixer_ch);
-	if (!num_names)
-		return -EINVAL;
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-	uinfo->count = 1;
-	uinfo->value.enumerated.items = num_names;
-	idx = uinfo->value.enumerated.item;
-	if (idx >= num_names)
-		return -EINVAL;
-	input_names = ak->adc_info[mixer_ch].input_names;
-	strncpy(uinfo->value.enumerated.name, input_names[idx],
-		sizeof(uinfo->value.enumerated.name));
-	return 0;
-}
-
-static int ak4xxx_capture_source_get(struct snd_kcontrol *kcontrol,
-				     struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_akm4xxx *ak = snd_kcontrol_chip(kcontrol);
-	int chip = AK_GET_CHIP(kcontrol->private_value);
-	int addr = AK_GET_ADDR(kcontrol->private_value);
-	int mask = AK_GET_MASK(kcontrol->private_value);
-	unsigned char val;
-
-	val = snd_akm4xxx_get(ak, chip, addr) & mask;
-	ucontrol->value.enumerated.item[0] = val;
-	return 0;
-}
-
-static int ak4xxx_capture_source_put(struct snd_kcontrol *kcontrol,
-				     struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_akm4xxx *ak = snd_kcontrol_chip(kcontrol);
-	int mixer_ch = AK_GET_SHIFT(kcontrol->private_value);
-	int chip = AK_GET_CHIP(kcontrol->private_value);
-	int addr = AK_GET_ADDR(kcontrol->private_value);
-	int mask = AK_GET_MASK(kcontrol->private_value);
-	unsigned char oval, val;
-	int num_names = ak4xxx_capture_num_inputs(ak, mixer_ch);
-
-	if (ucontrol->value.enumerated.item[0] >= num_names)
-		return -EINVAL;
-
-	oval = snd_akm4xxx_get(ak, chip, addr);
-	val = oval & ~mask;
-	val |= ucontrol->value.enumerated.item[0] & mask;
-	if (val != oval) {
-		snd_akm4xxx_write(ak, chip, addr, val);
-		return 1;
-	}
-	return 0;
-}
-
-/*
- * build AK4xxx controls
- */
-
-static int build_dac_controls(struct snd_akm4xxx *ak)
-{
-	int idx, err, mixer_ch, num_stereo;
-	struct snd_kcontrol_new knew;
-
-	mixer_ch = 0;
-	for (idx = 0; idx < ak->num_dacs; ) {
-		/* mute control for Revolution 7.1 - AK4381 */
-		if (ak->type == SND_AK4381 
-				&&  ak->dac_info[mixer_ch].switch_name) {
-			memset(&knew, 0, sizeof(knew));
-			knew.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-			knew.count = 1;
-			knew.access = SNDRV_CTL_ELEM_ACCESS_READWRITE;
-			knew.name = ak->dac_info[mixer_ch].switch_name;
-			knew.info = ak4xxx_switch_info;
-			knew.get = ak4xxx_switch_get;
-			knew.put = ak4xxx_switch_put;
-			knew.access = 0;
-			/* register 1, bit 0 (SMUTE): 0 = normal operation,
-			   1 = mute */
-			knew.private_value =
-				AK_COMPOSE(idx/2, 1, 0, 0) | AK_INVERT;
-			err = snd_ctl_add(ak->card, snd_ctl_new1(&knew, ak));
-			if (err < 0)
-				return err;
-		}
-		memset(&knew, 0, sizeof(knew));
-		if (! ak->dac_info || ! ak->dac_info[mixer_ch].name) {
-			knew.name = "DAC Volume";
-			knew.index = mixer_ch + ak->idx_offset * 2;
-			num_stereo = 1;
-		} else {
-			knew.name = ak->dac_info[mixer_ch].name;
-			num_stereo = ak->dac_info[mixer_ch].num_channels;
-		}
-		knew.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-		knew.count = 1;
-		knew.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
-			SNDRV_CTL_ELEM_ACCESS_TLV_READ;
-		if (num_stereo == 2) {
-			knew.info = snd_akm4xxx_stereo_volume_info;
-			knew.get = snd_akm4xxx_stereo_volume_get;
-			knew.put = snd_akm4xxx_stereo_volume_put;
-		} else {
-			knew.info = snd_akm4xxx_volume_info;
-			knew.get = snd_akm4xxx_volume_get;
-			knew.put = snd_akm4xxx_volume_put;
-		}
-		switch (ak->type) {
-		case SND_AK4524:
-			/* register 6 & 7 */
-			knew.private_value =
-				AK_COMPOSE(idx/2, (idx%2) + 6, 0, 127) |
-				AK_VOL_CVT;
-			knew.tlv.p = db_scale_vol_datt;
-			break;
-		case SND_AK4528:
-			/* register 4 & 5 */
-			knew.private_value =
-				AK_COMPOSE(idx/2, (idx%2) + 4, 0, 127) |
-				AK_VOL_CVT;
-			knew.tlv.p = db_scale_vol_datt;
-			break;
-		case SND_AK4529: {
-			/* registers 2-7 and b,c */
-			int val = idx < 6 ? idx + 2 : (idx - 6) + 0xb;
-			knew.private_value =
-				AK_COMPOSE(0, val, 0, 255) | AK_INVERT;
-			knew.tlv.p = db_scale_8bit;
-			break;
-		}
-		case SND_AK4355:
-			/* register 4-9, chip #0 only */
-			knew.private_value = AK_COMPOSE(0, idx + 4, 0, 255);
-			knew.tlv.p = db_scale_8bit;
-			break;
-		case SND_AK4358: {
-			/* register 4-9 and 11-12, chip #0 only */
-			int  addr = idx < 6 ? idx + 4 : idx + 5;
-			knew.private_value =
-				AK_COMPOSE(0, addr, 0, 127) | AK_NEEDSMSB;
-			knew.tlv.p = db_scale_7bit;
-			break;
-		}
-		case SND_AK4381:
-			/* register 3 & 4 */
-			knew.private_value =
-				AK_COMPOSE(idx/2, (idx%2) + 3, 0, 255);
-			knew.tlv.p = db_scale_linear;
-			break;
-		case SND_AK4620:
-			/* register 6 & 7 */
-			knew.private_value =
-				AK_COMPOSE(idx/2, (idx%2) + 6, 0, 255);
-			knew.tlv.p = db_scale_linear;
-			break;
-		default:
-			return -EINVAL;
-		}
-
-		err = snd_ctl_add(ak->card, snd_ctl_new1(&knew, ak));
-		if (err < 0)
-			return err;
-
-		idx += num_stereo;
-		mixer_ch++;
-	}
-	return 0;
-}
-
-static int build_adc_controls(struct snd_akm4xxx *ak)
-{
-	int idx, err, mixer_ch, num_stereo, max_steps;
-	struct snd_kcontrol_new knew;
-
-	mixer_ch = 0;
-	if (ak->type == SND_AK4528)
-		return 0;	/* no controls */
-	for (idx = 0; idx < ak->num_adcs;) {
-		memset(&knew, 0, sizeof(knew));
-		if (! ak->adc_info || ! ak->adc_info[mixer_ch].name) {
-			knew.name = "ADC Volume";
-			knew.index = mixer_ch + ak->idx_offset * 2;
-			num_stereo = 1;
-		} else {
-			knew.name = ak->adc_info[mixer_ch].name;
-			num_stereo = ak->adc_info[mixer_ch].num_channels;
-		}
-		knew.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-		knew.count = 1;
-		knew.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
-			SNDRV_CTL_ELEM_ACCESS_TLV_READ;
-		if (num_stereo == 2) {
-			knew.info = snd_akm4xxx_stereo_volume_info;
-			knew.get = snd_akm4xxx_stereo_volume_get;
-			knew.put = snd_akm4xxx_stereo_volume_put;
-		} else {
-			knew.info = snd_akm4xxx_volume_info;
-			knew.get = snd_akm4xxx_volume_get;
-			knew.put = snd_akm4xxx_volume_put;
-		}
-		/* register 4 & 5 */
-		if (ak->type == SND_AK5365)
-			max_steps = 152;
-		else
-			max_steps = 164;
-		knew.private_value =
-			AK_COMPOSE(idx/2, (idx%2) + 4, 0, max_steps) |
-			AK_VOL_CVT | AK_IPGA;
-		knew.tlv.p = db_scale_vol_datt;
-		err = snd_ctl_add(ak->card, snd_ctl_new1(&knew, ak));
-		if (err < 0)
-			return err;
-
-		if (ak->type == SND_AK5365 && (idx % 2) == 0) {
-			if (! ak->adc_info || 
-			    ! ak->adc_info[mixer_ch].switch_name) {
-				knew.name = "Capture Switch";
-				knew.index = mixer_ch + ak->idx_offset * 2;
-			} else
-				knew.name = ak->adc_info[mixer_ch].switch_name;
-			knew.info = ak4xxx_switch_info;
-			knew.get = ak4xxx_switch_get;
-			knew.put = ak4xxx_switch_put;
-			knew.access = 0;
-			/* register 2, bit 0 (SMUTE): 0 = normal operation,
-			   1 = mute */
-			knew.private_value =
-				AK_COMPOSE(idx/2, 2, 0, 0) | AK_INVERT;
-			err = snd_ctl_add(ak->card, snd_ctl_new1(&knew, ak));
-			if (err < 0)
-				return err;
-
-			memset(&knew, 0, sizeof(knew));
-			knew.name = ak->adc_info[mixer_ch].selector_name;
-			if (!knew.name) {
-				knew.name = "Capture Channel";
-				knew.index = mixer_ch + ak->idx_offset * 2;
-			}
-
-			knew.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-			knew.info = ak4xxx_capture_source_info;
-			knew.get = ak4xxx_capture_source_get;
-			knew.put = ak4xxx_capture_source_put;
-			knew.access = 0;
-			/* input selector control: reg. 1, bits 0-2.
-			 * mis-use 'shift' to pass mixer_ch */
-			knew.private_value
-				= AK_COMPOSE(idx/2, 1, mixer_ch, 0x07);
-			err = snd_ctl_add(ak->card, snd_ctl_new1(&knew, ak));
-			if (err < 0)
-				return err;
-		}
-
-		idx += num_stereo;
-		mixer_ch++;
-	}
-	return 0;
-}
-
-static int build_deemphasis(struct snd_akm4xxx *ak, int num_emphs)
-{
-	int idx, err;
-	struct snd_kcontrol_new knew;
-
-	for (idx = 0; idx < num_emphs; idx++) {
-		memset(&knew, 0, sizeof(knew));
-		knew.name = "Deemphasis";
-		knew.index = idx + ak->idx_offset;
-		knew.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-		knew.count = 1;
-		knew.info = snd_akm4xxx_deemphasis_info;
-		knew.get = snd_akm4xxx_deemphasis_get;
-		knew.put = snd_akm4xxx_deemphasis_put;
-		switch (ak->type) {
-		case SND_AK4524:
-		case SND_AK4528:
-		case SND_AK4620:
-			/* register 3 */
-			knew.private_value = AK_COMPOSE(idx, 3, 0, 0);
-			break;
-		case SND_AK4529: {
-			int shift = idx == 3 ? 6 : (2 - idx) * 2;
-			/* register 8 with shift */
-			knew.private_value = AK_COMPOSE(0, 8, shift, 0);
-			break;
-		}
-		case SND_AK4355:
-		case SND_AK4358:
-			knew.private_value = AK_COMPOSE(idx, 3, 0, 0);
-			break;
-		case SND_AK4381:
-			knew.private_value = AK_COMPOSE(idx, 1, 1, 0);
-			break;
-		default:
-			return -EINVAL;
-		}
-		err = snd_ctl_add(ak->card, snd_ctl_new1(&knew, ak));
-		if (err < 0)
-			return err;
-	}
-	return 0;
-}
-
-#ifdef CONFIG_PROC_FS
-static void proc_regs_read(struct snd_info_entry *entry,
-		struct snd_info_buffer *buffer)
-{
-	struct snd_akm4xxx *ak = entry->private_data;
-	int reg, val, chip;
-	for (chip = 0; chip < ak->num_chips; chip++) {
-		for (reg = 0; reg < ak->total_regs; reg++) {
-			val =  snd_akm4xxx_get(ak, chip, reg);
-			snd_iprintf(buffer, "chip %d: 0x%02x = 0x%02x\n", chip,
-					reg, val);
-		}
-	}
-}
-
-static int proc_init(struct snd_akm4xxx *ak)
-{
-	struct snd_info_entry *entry;
-	int err;
-	err = snd_card_proc_new(ak->card, ak->name, &entry);
-	if (err < 0)
-		return err;
-	snd_info_set_text_ops(entry, ak, proc_regs_read);
-	return 0;
-}
-#else /* !CONFIG_PROC_FS */
-static int proc_init(struct snd_akm4xxx *ak) { return 0; }
-#endif
-
-int snd_akm4xxx_build_controls(struct snd_akm4xxx *ak)
-{
-	int err, num_emphs;
-
-	err = build_dac_controls(ak);
-	if (err < 0)
-		return err;
-
-	err = build_adc_controls(ak);
-	if (err < 0)
-		return err;
-	if (ak->type == SND_AK4355 || ak->type == SND_AK4358)
-		num_emphs = 1;
-	else if (ak->type == SND_AK4620)
-		num_emphs = 0;
-	else
-		num_emphs = ak->num_dacs / 2;
-	err = build_deemphasis(ak, num_emphs);
-	if (err < 0)
-		return err;
-	err = proc_init(ak);
-	if (err < 0)
-		return err;
-
-	return 0;
-}
-EXPORT_SYMBOL(snd_akm4xxx_build_controls);
-
-static int __init alsa_akm4xxx_module_init(void)
-{
-	return 0;
-}
-        
-static void __exit alsa_akm4xxx_module_exit(void)
-{
-}
-        
-module_init(alsa_akm4xxx_module_init)
-module_exit(alsa_akm4xxx_module_exit)
diff --git a/ANDROID_3.4.5/sound/i2c/other/pt2258.c b/ANDROID_3.4.5/sound/i2c/other/pt2258.c
deleted file mode 100644
index 9fa390ba..00000000
--- a/ANDROID_3.4.5/sound/i2c/other/pt2258.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- *   ALSA Driver for the PT2258 volume controller.
- *
- *	Copyright (c) 2006  Jochen Voss <voss@seehuhn.de>
- *
- *   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 <sound/core.h>
-#include <sound/control.h>
-#include <sound/tlv.h>
-#include <sound/i2c.h>
-#include <sound/pt2258.h>
-#include <linux/module.h>
-
-MODULE_AUTHOR("Jochen Voss <voss@seehuhn.de>");
-MODULE_DESCRIPTION("PT2258 volume controller (Princeton Technology Corp.)");
-MODULE_LICENSE("GPL");
-
-#define PT2258_CMD_RESET 0xc0
-#define PT2258_CMD_UNMUTE 0xf8
-#define PT2258_CMD_MUTE 0xf9
-
-static const unsigned char pt2258_channel_code[12] = {
-	0x80, 0x90,		/* channel 1: -10dB, -1dB */
-	0x40, 0x50,		/* channel 2: -10dB, -1dB */
-	0x00, 0x10,		/* channel 3: -10dB, -1dB */
-	0x20, 0x30,		/* channel 4: -10dB, -1dB */
-	0x60, 0x70,		/* channel 5: -10dB, -1dB */
-	0xa0, 0xb0		/* channel 6: -10dB, -1dB */
-};
-
-int snd_pt2258_reset(struct snd_pt2258 *pt)
-{
-	unsigned char bytes[2];
-	int i;
-
-	/* reset chip */
-	bytes[0] = PT2258_CMD_RESET;
-	snd_i2c_lock(pt->i2c_bus);
-	if (snd_i2c_sendbytes(pt->i2c_dev, bytes, 1) != 1)
-		goto __error;
-	snd_i2c_unlock(pt->i2c_bus);
-
-	/* mute all channels */
-	pt->mute = 1;
-	bytes[0] = PT2258_CMD_MUTE;
-	snd_i2c_lock(pt->i2c_bus);
-	if (snd_i2c_sendbytes(pt->i2c_dev, bytes, 1) != 1)
-		goto __error;
-	snd_i2c_unlock(pt->i2c_bus);
-
-	/* set all channels to 0dB */
-	for (i = 0; i < 6; ++i)
-		pt->volume[i] = 0;
-	bytes[0] = 0xd0;
-	bytes[1] = 0xe0;
-	snd_i2c_lock(pt->i2c_bus);
-	if (snd_i2c_sendbytes(pt->i2c_dev, bytes, 2) != 2)
-		goto __error;
-	snd_i2c_unlock(pt->i2c_bus);
-
-	return 0;
-
-      __error:
-	snd_i2c_unlock(pt->i2c_bus);
-	snd_printk(KERN_ERR "PT2258 reset failed\n");
-	return -EIO;
-}
-
-static int pt2258_stereo_volume_info(struct snd_kcontrol *kcontrol,
-				     struct snd_ctl_elem_info *uinfo)
-{
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-	uinfo->count = 2;
-	uinfo->value.integer.min = 0;
-	uinfo->value.integer.max = 79;
-	return 0;
-}
-
-static int pt2258_stereo_volume_get(struct snd_kcontrol *kcontrol,
-				    struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_pt2258 *pt = kcontrol->private_data;
-	int base = kcontrol->private_value;
-
-	/* chip does not support register reads */
-	ucontrol->value.integer.value[0] = 79 - pt->volume[base];
-	ucontrol->value.integer.value[1] = 79 - pt->volume[base + 1];
-	return 0;
-}
-
-static int pt2258_stereo_volume_put(struct snd_kcontrol *kcontrol,
-				    struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_pt2258 *pt = kcontrol->private_data;
-	int base = kcontrol->private_value;
-	unsigned char bytes[2];
-	int val0, val1;
-
-	val0 = 79 - ucontrol->value.integer.value[0];
-	val1 = 79 - ucontrol->value.integer.value[1];
-	if (val0 < 0 || val0 > 79 || val1 < 0 || val1 > 79)
-		return -EINVAL;
-	if (val0 == pt->volume[base] && val1 == pt->volume[base + 1])
-		return 0;
-
-	pt->volume[base] = val0;
-	bytes[0] = pt2258_channel_code[2 * base] | (val0 / 10);
-	bytes[1] = pt2258_channel_code[2 * base + 1] | (val0 % 10);
-	snd_i2c_lock(pt->i2c_bus);
-	if (snd_i2c_sendbytes(pt->i2c_dev, bytes, 2) != 2)
-		goto __error;
-	snd_i2c_unlock(pt->i2c_bus);
-
-	pt->volume[base + 1] = val1;
-	bytes[0] = pt2258_channel_code[2 * base + 2] | (val1 / 10);
-	bytes[1] = pt2258_channel_code[2 * base + 3] | (val1 % 10);
-	snd_i2c_lock(pt->i2c_bus);
-	if (snd_i2c_sendbytes(pt->i2c_dev, bytes, 2) != 2)
-		goto __error;
-	snd_i2c_unlock(pt->i2c_bus);
-
-	return 1;
-
-      __error:
-	snd_i2c_unlock(pt->i2c_bus);
-	snd_printk(KERN_ERR "PT2258 access failed\n");
-	return -EIO;
-}
-
-#define pt2258_switch_info	snd_ctl_boolean_mono_info
-
-static int pt2258_switch_get(struct snd_kcontrol *kcontrol,
-			     struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_pt2258 *pt = kcontrol->private_data;
-
-	ucontrol->value.integer.value[0] = !pt->mute;
-	return 0;
-}
-
-static int pt2258_switch_put(struct snd_kcontrol *kcontrol,
-			     struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_pt2258 *pt = kcontrol->private_data;
-	unsigned char bytes[2];
-	int val;
-
-	val = !ucontrol->value.integer.value[0];
-	if (pt->mute == val)
-		return 0;
-
-	pt->mute = val;
-	bytes[0] = val ? PT2258_CMD_MUTE : PT2258_CMD_UNMUTE;
-	snd_i2c_lock(pt->i2c_bus);
-	if (snd_i2c_sendbytes(pt->i2c_dev, bytes, 1) != 1)
-		goto __error;
-	snd_i2c_unlock(pt->i2c_bus);
-
-	return 1;
-
-      __error:
-	snd_i2c_unlock(pt->i2c_bus);
-	snd_printk(KERN_ERR "PT2258 access failed 2\n");
-	return -EIO;
-}
-
-static const DECLARE_TLV_DB_SCALE(pt2258_db_scale, -7900, 100, 0);
-
-int snd_pt2258_build_controls(struct snd_pt2258 *pt)
-{
-	struct snd_kcontrol_new knew;
-	char *names[3] = {
-		"Mic Loopback Playback Volume",
-		"Line Loopback Playback Volume",
-		"CD Loopback Playback Volume"
-	};
-	int i, err;
-
-	for (i = 0; i < 3; ++i) {
-		memset(&knew, 0, sizeof(knew));
-		knew.name = names[i];
-		knew.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-		knew.count = 1;
-		knew.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
-		    SNDRV_CTL_ELEM_ACCESS_TLV_READ;
-		knew.private_value = 2 * i;
-		knew.info = pt2258_stereo_volume_info;
-		knew.get = pt2258_stereo_volume_get;
-		knew.put = pt2258_stereo_volume_put;
-		knew.tlv.p = pt2258_db_scale;
-
-		err = snd_ctl_add(pt->card, snd_ctl_new1(&knew, pt));
-		if (err < 0)
-			return err;
-	}
-
-	memset(&knew, 0, sizeof(knew));
-	knew.name = "Loopback Switch";
-	knew.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-	knew.info = pt2258_switch_info;
-	knew.get = pt2258_switch_get;
-	knew.put = pt2258_switch_put;
-	knew.access = 0;
-	err = snd_ctl_add(pt->card, snd_ctl_new1(&knew, pt));
-	if (err < 0)
-		return err;
-
-	return 0;
-}
-
-EXPORT_SYMBOL(snd_pt2258_reset);
-EXPORT_SYMBOL(snd_pt2258_build_controls);
diff --git a/ANDROID_3.4.5/sound/i2c/other/tea575x-tuner.c b/ANDROID_3.4.5/sound/i2c/other/tea575x-tuner.c
deleted file mode 100644
index a63faec5..00000000
--- a/ANDROID_3.4.5/sound/i2c/other/tea575x-tuner.c
+++ /dev/null
@@ -1,427 +0,0 @@
-/*
- *   ALSA driver for TEA5757/5759 Philips AM/FM radio tuner chips
- *
- *	Copyright (c) 2004 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/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/sched.h>
-#include <media/v4l2-device.h>
-#include <media/v4l2-dev.h>
-#include <media/v4l2-fh.h>
-#include <media/v4l2-ioctl.h>
-#include <media/v4l2-event.h>
-#include <sound/tea575x-tuner.h>
-
-MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
-MODULE_DESCRIPTION("Routines for control of TEA5757/5759 Philips AM/FM radio tuner chips");
-MODULE_LICENSE("GPL");
-
-#define FREQ_LO		 (76U * 16000)
-#define FREQ_HI		(108U * 16000)
-
-/*
- * definitions
- */
-
-#define TEA575X_BIT_SEARCH	(1<<24)		/* 1 = search action, 0 = tuned */
-#define TEA575X_BIT_UPDOWN	(1<<23)		/* 0 = search down, 1 = search up */
-#define TEA575X_BIT_MONO	(1<<22)		/* 0 = stereo, 1 = mono */
-#define TEA575X_BIT_BAND_MASK	(3<<20)
-#define TEA575X_BIT_BAND_FM	(0<<20)
-#define TEA575X_BIT_BAND_MW	(1<<20)
-#define TEA575X_BIT_BAND_LW	(1<<21)
-#define TEA575X_BIT_BAND_SW	(1<<22)
-#define TEA575X_BIT_PORT_0	(1<<19)		/* user bit */
-#define TEA575X_BIT_PORT_1	(1<<18)		/* user bit */
-#define TEA575X_BIT_SEARCH_MASK	(3<<16)		/* search level */
-#define TEA575X_BIT_SEARCH_5_28	     (0<<16)	/* FM >5uV, AM >28uV */
-#define TEA575X_BIT_SEARCH_10_40     (1<<16)	/* FM >10uV, AM > 40uV */
-#define TEA575X_BIT_SEARCH_30_63     (2<<16)	/* FM >30uV, AM > 63uV */
-#define TEA575X_BIT_SEARCH_150_1000  (3<<16)	/* FM > 150uV, AM > 1000uV */
-#define TEA575X_BIT_DUMMY	(1<<15)		/* buffer */
-#define TEA575X_BIT_FREQ_MASK	0x7fff
-
-/*
- * lowlevel part
- */
-
-static void snd_tea575x_write(struct snd_tea575x *tea, unsigned int val)
-{
-	u16 l;
-	u8 data;
-
-	tea->ops->set_direction(tea, 1);
-	udelay(16);
-
-	for (l = 25; l > 0; l--) {
-		data = (val >> 24) & TEA575X_DATA;
-		val <<= 1;			/* shift data */
-		tea->ops->set_pins(tea, data | TEA575X_WREN);
-		udelay(2);
-		tea->ops->set_pins(tea, data | TEA575X_WREN | TEA575X_CLK);
-		udelay(2);
-		tea->ops->set_pins(tea, data | TEA575X_WREN);
-		udelay(2);
-	}
-
-	if (!tea->mute)
-		tea->ops->set_pins(tea, 0);
-}
-
-static u32 snd_tea575x_read(struct snd_tea575x *tea)
-{
-	u16 l, rdata;
-	u32 data = 0;
-
-	tea->ops->set_direction(tea, 0);
-	tea->ops->set_pins(tea, 0);
-	udelay(16);
-
-	for (l = 24; l--;) {
-		tea->ops->set_pins(tea, TEA575X_CLK);
-		udelay(2);
-		if (!l)
-			tea->tuned = tea->ops->get_pins(tea) & TEA575X_MOST ? 0 : 1;
-		tea->ops->set_pins(tea, 0);
-		udelay(2);
-		data <<= 1;			/* shift data */
-		rdata = tea->ops->get_pins(tea);
-		if (!l)
-			tea->stereo = (rdata & TEA575X_MOST) ?  0 : 1;
-		if (rdata & TEA575X_DATA)
-			data++;
-		udelay(2);
-	}
-
-	if (tea->mute)
-		tea->ops->set_pins(tea, TEA575X_WREN);
-
-	return data;
-}
-
-static u32 snd_tea575x_get_freq(struct snd_tea575x *tea)
-{
-	u32 freq = snd_tea575x_read(tea) & TEA575X_BIT_FREQ_MASK;
-
-	if (freq == 0)
-		return freq;
-
-	/* freq *= 12.5 */
-	freq *= 125;
-	freq /= 10;
-	/* crystal fixup */
-	if (tea->tea5759)
-		freq += TEA575X_FMIF;
-	else
-		freq -= TEA575X_FMIF;
-
-	return clamp(freq * 16, FREQ_LO, FREQ_HI); /* from kHz */
-}
-
-static void snd_tea575x_set_freq(struct snd_tea575x *tea)
-{
-	u32 freq = tea->freq;
-
-	freq /= 16;		/* to kHz */
-	/* crystal fixup */
-	if (tea->tea5759)
-		freq -= TEA575X_FMIF;
-	else
-		freq += TEA575X_FMIF;
-	/* freq /= 12.5 */
-	freq *= 10;
-	freq /= 125;
-
-	tea->val &= ~TEA575X_BIT_FREQ_MASK;
-	tea->val |= freq & TEA575X_BIT_FREQ_MASK;
-	snd_tea575x_write(tea, tea->val);
-}
-
-/*
- * Linux Video interface
- */
-
-static int vidioc_querycap(struct file *file, void  *priv,
-					struct v4l2_capability *v)
-{
-	struct snd_tea575x *tea = video_drvdata(file);
-
-	strlcpy(v->driver, tea->v4l2_dev->name, sizeof(v->driver));
-	strlcpy(v->card, tea->card, sizeof(v->card));
-	strlcat(v->card, tea->tea5759 ? " TEA5759" : " TEA5757", sizeof(v->card));
-	strlcpy(v->bus_info, tea->bus_info, sizeof(v->bus_info));
-	v->device_caps = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
-	if (!tea->cannot_read_data)
-		v->device_caps |= V4L2_CAP_HW_FREQ_SEEK;
-	v->capabilities = v->device_caps | V4L2_CAP_DEVICE_CAPS;
-	return 0;
-}
-
-static int vidioc_g_tuner(struct file *file, void *priv,
-					struct v4l2_tuner *v)
-{
-	struct snd_tea575x *tea = video_drvdata(file);
-
-	if (v->index > 0)
-		return -EINVAL;
-
-	snd_tea575x_read(tea);
-
-	strcpy(v->name, "FM");
-	v->type = V4L2_TUNER_RADIO;
-	v->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO;
-	v->rangelow = FREQ_LO;
-	v->rangehigh = FREQ_HI;
-	v->rxsubchans = tea->stereo ? V4L2_TUNER_SUB_STEREO : V4L2_TUNER_SUB_MONO;
-	v->audmode = (tea->val & TEA575X_BIT_MONO) ?
-		V4L2_TUNER_MODE_MONO : V4L2_TUNER_MODE_STEREO;
-	v->signal = tea->tuned ? 0xffff : 0;
-	return 0;
-}
-
-static int vidioc_s_tuner(struct file *file, void *priv,
-					struct v4l2_tuner *v)
-{
-	struct snd_tea575x *tea = video_drvdata(file);
-
-	if (v->index)
-		return -EINVAL;
-	tea->val &= ~TEA575X_BIT_MONO;
-	if (v->audmode == V4L2_TUNER_MODE_MONO)
-		tea->val |= TEA575X_BIT_MONO;
-	snd_tea575x_write(tea, tea->val);
-	return 0;
-}
-
-static int vidioc_g_frequency(struct file *file, void *priv,
-					struct v4l2_frequency *f)
-{
-	struct snd_tea575x *tea = video_drvdata(file);
-
-	if (f->tuner != 0)
-		return -EINVAL;
-	f->type = V4L2_TUNER_RADIO;
-	f->frequency = tea->freq;
-	return 0;
-}
-
-static int vidioc_s_frequency(struct file *file, void *priv,
-					struct v4l2_frequency *f)
-{
-	struct snd_tea575x *tea = video_drvdata(file);
-
-	if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
-		return -EINVAL;
-
-	tea->val &= ~TEA575X_BIT_SEARCH;
-	tea->freq = clamp(f->frequency, FREQ_LO, FREQ_HI);
-	snd_tea575x_set_freq(tea);
-	return 0;
-}
-
-static int vidioc_s_hw_freq_seek(struct file *file, void *fh,
-					struct v4l2_hw_freq_seek *a)
-{
-	struct snd_tea575x *tea = video_drvdata(file);
-	unsigned long timeout;
-	int i;
-
-	if (tea->cannot_read_data)
-		return -ENOTTY;
-	if (a->tuner || a->wrap_around)
-		return -EINVAL;
-
-	/* clear the frequency, HW will fill it in */
-	tea->val &= ~TEA575X_BIT_FREQ_MASK;
-	tea->val |= TEA575X_BIT_SEARCH;
-	if (a->seek_upward)
-		tea->val |= TEA575X_BIT_UPDOWN;
-	else
-		tea->val &= ~TEA575X_BIT_UPDOWN;
-	snd_tea575x_write(tea, tea->val);
-	timeout = jiffies + msecs_to_jiffies(10000);
-	for (;;) {
-		if (time_after(jiffies, timeout))
-			break;
-		if (schedule_timeout_interruptible(msecs_to_jiffies(10))) {
-			/* some signal arrived, stop search */
-			tea->val &= ~TEA575X_BIT_SEARCH;
-			snd_tea575x_set_freq(tea);
-			return -ERESTARTSYS;
-		}
-		if (!(snd_tea575x_read(tea) & TEA575X_BIT_SEARCH)) {
-			u32 freq;
-
-			/* Found a frequency, wait until it can be read */
-			for (i = 0; i < 100; i++) {
-				msleep(10);
-				freq = snd_tea575x_get_freq(tea);
-				if (freq) /* available */
-					break;
-			}
-			if (freq == 0) /* shouldn't happen */
-				break;
-			/*
-			 * if we moved by less than 50 kHz, or in the wrong
-			 * direction, continue seeking
-			 */
-			if (abs(tea->freq - freq) < 16 * 50 ||
-					(a->seek_upward && freq < tea->freq) ||
-					(!a->seek_upward && freq > tea->freq)) {
-				snd_tea575x_write(tea, tea->val);
-				continue;
-			}
-			tea->freq = freq;
-			tea->val &= ~TEA575X_BIT_SEARCH;
-			return 0;
-		}
-	}
-	tea->val &= ~TEA575X_BIT_SEARCH;
-	snd_tea575x_set_freq(tea);
-	return -EAGAIN;
-}
-
-static int tea575x_s_ctrl(struct v4l2_ctrl *ctrl)
-{
-	struct snd_tea575x *tea = container_of(ctrl->handler, struct snd_tea575x, ctrl_handler);
-
-	switch (ctrl->id) {
-	case V4L2_CID_AUDIO_MUTE:
-		tea->mute = ctrl->val;
-		snd_tea575x_set_freq(tea);
-		return 0;
-	}
-
-	return -EINVAL;
-}
-
-static const struct v4l2_file_operations tea575x_fops = {
-	.owner		= THIS_MODULE,
-	.unlocked_ioctl	= video_ioctl2,
-	.open           = v4l2_fh_open,
-	.release        = v4l2_fh_release,
-	.poll           = v4l2_ctrl_poll,
-};
-
-static const struct v4l2_ioctl_ops tea575x_ioctl_ops = {
-	.vidioc_querycap    = vidioc_querycap,
-	.vidioc_g_tuner     = vidioc_g_tuner,
-	.vidioc_s_tuner     = vidioc_s_tuner,
-	.vidioc_g_frequency = vidioc_g_frequency,
-	.vidioc_s_frequency = vidioc_s_frequency,
-	.vidioc_s_hw_freq_seek = vidioc_s_hw_freq_seek,
-	.vidioc_log_status  = v4l2_ctrl_log_status,
-	.vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
-	.vidioc_unsubscribe_event = v4l2_event_unsubscribe,
-};
-
-static const struct video_device tea575x_radio = {
-	.fops           = &tea575x_fops,
-	.ioctl_ops 	= &tea575x_ioctl_ops,
-	.release        = video_device_release_empty,
-};
-
-static const struct v4l2_ctrl_ops tea575x_ctrl_ops = {
-	.s_ctrl = tea575x_s_ctrl,
-};
-
-/*
- * initialize all the tea575x chips
- */
-int snd_tea575x_init(struct snd_tea575x *tea)
-{
-	int retval;
-
-	tea->mute = true;
-
-	/* Not all devices can or know how to read the data back.
-	   Such devices can set cannot_read_data to true. */
-	if (!tea->cannot_read_data) {
-		snd_tea575x_write(tea, 0x55AA);
-		if (snd_tea575x_read(tea) != 0x55AA)
-			return -ENODEV;
-	}
-
-	tea->val = TEA575X_BIT_BAND_FM | TEA575X_BIT_SEARCH_5_28;
-	tea->freq = 90500 * 16;		/* 90.5Mhz default */
-	snd_tea575x_set_freq(tea);
-
-	tea->vd = tea575x_radio;
-	video_set_drvdata(&tea->vd, tea);
-	mutex_init(&tea->mutex);
-	strlcpy(tea->vd.name, tea->v4l2_dev->name, sizeof(tea->vd.name));
-	tea->vd.lock = &tea->mutex;
-	tea->vd.v4l2_dev = tea->v4l2_dev;
-	tea->vd.ctrl_handler = &tea->ctrl_handler;
-	set_bit(V4L2_FL_USE_FH_PRIO, &tea->vd.flags);
-
-	v4l2_ctrl_handler_init(&tea->ctrl_handler, 1);
-	v4l2_ctrl_new_std(&tea->ctrl_handler, &tea575x_ctrl_ops, V4L2_CID_AUDIO_MUTE, 0, 1, 1, 1);
-	retval = tea->ctrl_handler.error;
-	if (retval) {
-		v4l2_err(tea->v4l2_dev, "can't initialize controls\n");
-		v4l2_ctrl_handler_free(&tea->ctrl_handler);
-		return retval;
-	}
-
-	if (tea->ext_init) {
-		retval = tea->ext_init(tea);
-		if (retval) {
-			v4l2_ctrl_handler_free(&tea->ctrl_handler);
-			return retval;
-		}
-	}
-
-	v4l2_ctrl_handler_setup(&tea->ctrl_handler);
-
-	retval = video_register_device(&tea->vd, VFL_TYPE_RADIO, tea->radio_nr);
-	if (retval) {
-		v4l2_err(tea->v4l2_dev, "can't register video device!\n");
-		v4l2_ctrl_handler_free(&tea->ctrl_handler);
-		return retval;
-	}
-
-	return 0;
-}
-
-void snd_tea575x_exit(struct snd_tea575x *tea)
-{
-	video_unregister_device(&tea->vd);
-	v4l2_ctrl_handler_free(&tea->ctrl_handler);
-}
-
-static int __init alsa_tea575x_module_init(void)
-{
-	return 0;
-}
-
-static void __exit alsa_tea575x_module_exit(void)
-{
-}
-
-module_init(alsa_tea575x_module_init)
-module_exit(alsa_tea575x_module_exit)
-
-EXPORT_SYMBOL(snd_tea575x_init);
-EXPORT_SYMBOL(snd_tea575x_exit);