summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mx35/mx35_3stack.c
diff options
context:
space:
mode:
authorAlan Tull <r80115@freescale.com>2009-11-02 19:44:22 -0600
committerAlejandro Gonzalez <alex.gonzalez@digi.com>2010-02-12 17:19:31 +0100
commitfa012c4c0927fe862397110c7c23d3a6b516374e (patch)
tree29f2ef3da1bb4122f76e0a05ab68ca831564dfa3 /arch/arm/mach-mx35/mx35_3stack.c
parent90f3c1e8f3b63ae6a7aca35b17740e48b8055167 (diff)
ENGR00118016-1 ASoC : upgrade audio support to 2.6.31
Move regulator control into codec drivers. Move codec platform data to machine layer. Remove unused fields from mxc_audio_platform_data. soc multiple audio cards support: dai_list is a list for all registered codec/cpu dais. One codec/cpu dais can't be registered twice, so move the cpu dai registering into imx-ssi.c/imx-esai.c Fix ak4647_read_reg error. Put ssi/esai mode in the cpu_dai private_data. sgtl5000: Fix the power for MX35 1. MX35 vddio and vddd are directly connected to external 3V3. It has no regulator control. 2. sgtl5000 needs some time to be ready after vdda is switched on so msleep(1) is added before regiter read/write. 3. On MX35 platform, vdda is from VCAM. Signed-off-by: Alan Tull <r80115@freescale.com> Signed-off-by: Wallace Wang <r59996@freescale.com>
Diffstat (limited to 'arch/arm/mach-mx35/mx35_3stack.c')
-rw-r--r--arch/arm/mach-mx35/mx35_3stack.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-mx35/mx35_3stack.c b/arch/arm/mach-mx35/mx35_3stack.c
index 02fed337d772..1231d5e59e2f 100644
--- a/arch/arm/mach-mx35/mx35_3stack.c
+++ b/arch/arm/mach-mx35/mx35_3stack.c
@@ -865,12 +865,7 @@ static struct mxc_audio_platform_data sgtl5000_data = {
.ext_port = 4,
.hp_irq = MXC_PSEUDO_IRQ_HEADPHONE,
.hp_status = sgtl5000_headphone_det_status,
- .vddio_reg = NULL,
- .vdda_reg = "VCAM",
.amp_enable = mxc_sgtl5000_amp_enable,
- .vddio = 0,
- .vdda = 3000000,
- .vddd = 0,
.sysclk = 12000000,
.init = mxc_sgtl5000_plat_init,
.finit = mxc_sgtl5000_plat_finit,