diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2012-07-30 17:08:14 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-07-30 17:08:14 +0530 |
| commit | 4cc8fa40b89a47cba1b38a6ae974e3a0670d050d (patch) | |
| tree | a128a5ca406aae8121cd1c7a9cb6cdfc6e7c2183 /arch/arm/mach-tegra/board-cardhu.c | |
| parent | 42a6876a04ecb4806d7bb18310dc6efdcb523dc2 (diff) | |
Revert "ARM: tegra: integration of slave mode support."
This reverts commit a50e73c5be9f5a3546bf575588385b59deee7092 as it
breaks bootup on Cardhu.
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-cardhu.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu.c | 46 |
1 files changed, 8 insertions, 38 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c index 0b8c71bbcdd6..37debb70c449 100644 --- a/arch/arm/mach-tegra/board-cardhu.c +++ b/arch/arm/mach-tegra/board-cardhu.c @@ -2,7 +2,6 @@ * arch/arm/mach-tegra/board-cardhu.c * * Copyright (c) 2011-2012, NVIDIA Corporation. All rights reserved. - * Copyright (c) 2011-2012, NVIDIA Corporation. * * 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 @@ -731,25 +730,12 @@ static struct platform_device tegra_rtc_device = { .num_resources = ARRAY_SIZE(tegra_rtc_resources), }; -static struct tegra_asoc_platform_data cardhu_audio_wm8903_pdata = { +static struct tegra_wm8903_platform_data cardhu_audio_wm8903_pdata = { .gpio_spkr_en = TEGRA_GPIO_SPKR_EN, .gpio_hp_det = TEGRA_GPIO_HP_DET, .gpio_hp_mute = -1, .gpio_int_mic_en = -1, .gpio_ext_mic_en = -1, - .i2s_param[HIFI_CODEC] = { - .audio_port_id = 0, - .is_i2s_master = 1, - .i2s_mode = TEGRA_DAIFMT_I2S, - }, - .i2s_param[BASEBAND] = { - .audio_port_id = -1, - }, - .i2s_param[BT_SCO] = { - .audio_port_id = 3, - .is_i2s_master = 1, - .i2s_mode = TEGRA_DAIFMT_DSP_A, - }, }; static struct tegra_asoc_platform_data cardhu_audio_max98095_pdata = { @@ -758,19 +744,6 @@ static struct tegra_asoc_platform_data cardhu_audio_max98095_pdata = { .gpio_hp_mute = -1, .gpio_int_mic_en = -1, .gpio_ext_mic_en = -1, - .i2s_param[HIFI_CODEC] = { - .audio_port_id = 0, - .is_i2s_master = 1, - .i2s_mode = TEGRA_DAIFMT_I2S, - }, - .i2s_param[BASEBAND] = { - .audio_port_id = -1, - }, - .i2s_param[BT_SCO] = { - .audio_port_id = 3, - .is_i2s_master = 1, - .i2s_mode = TEGRA_DAIFMT_DSP_A, - }, }; static struct platform_device cardhu_audio_wm8903_device = { @@ -796,17 +769,14 @@ static struct tegra_asoc_platform_data cardhu_audio_aic326x_pdata = { .gpio_int_mic_en = -1, .gpio_ext_mic_en = -1, /*defaults for Verbier-Cardhu board with TI AIC326X codec*/ - .i2s_param[HIFI_CODEC] = { - .audio_port_id = 0, - .is_i2s_master = 1, - .i2s_mode = TEGRA_DAIFMT_I2S, - .sample_size = 16, + .audio_port_id = { + [HIFI_CODEC] = 0, + [BASEBAND] = -1, + [BT_SCO] = 3, }, - .i2s_param[BT_SCO] = { - .sample_size = 16, - .audio_port_id = 3, - .is_i2s_master = 1, - .i2s_mode = TEGRA_DAIFMT_DSP_A, + .baseband_param = { + .rate = -1, + .channels = -1, }, }; |