summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-harmony.c
diff options
context:
space:
mode:
authorAnkit Gupta <ankitgupta@nvidia.com>2012-07-13 14:58:18 +0530
committerSimone Willett <swillett@nvidia.com>2012-07-27 15:36:20 -0700
commit907bac80691c7df5b5b57cbf27f91e8bb1dcf434 (patch)
tree6faf5515229b1caa85e824188017d1f1e6c6452d /arch/arm/mach-tegra/board-harmony.c
parent5c84dc32d54f8bbda99f8a4e1fd7300e6b5a50b3 (diff)
ARM: tegra: integration of slave mode support.
Add configurability support for i2s parameters accross all board. ARM: tegra: board: add i2s params Add configurability support for i2s parameters accross all board files. Signed-off-by: Ankit Gupta <ankitgupta@nvidia.com> Change-Id: If58788b5126280b7e1dc8c66e9c96d0e71229b5e Reviewed-on: http://git-master/r/111476 (cherry-picked from commit cac52867b0a0cad3b3c5bf46f08b0b94d0be2e02) ARM: tegra: include: add configurability support for i2s params. Add several variables for i2s configuration in platform data structure. Signed-off-by: Ankit Gupta <ankitgupta@nvidia.com> Change-Id: Iea3930f308954471f170513234c2c02a8559ef98 Reviewed-on: http://git-master/r/111473 (cherry picked from commit 35e749770f6046fc82860f1152db2f5f579b9508) Reviewed-on: http://git-master/r/118071 Reviewed-by: Sumit Bhattacharya <sumitb@nvidia.com> Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Scott Peterson <speterson@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-harmony.c')
-rw-r--r--arch/arm/mach-tegra/board-harmony.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c
index dd14435cc17c..0e1dfe58b278 100644
--- a/arch/arm/mach-tegra/board-harmony.c
+++ b/arch/arm/mach-tegra/board-harmony.c
@@ -3,6 +3,7 @@
*
* Copyright (C) 2010 Google, Inc.
* Copyright (C) 2011 NVIDIA, Inc.
+ * Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved.
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
@@ -43,7 +44,7 @@
#include <asm/mach/time.h>
#include <asm/setup.h>
-#include <mach/tegra_wm8903_pdata.h>
+#include <mach/tegra_asoc_pdata.h>
#include <mach/iomap.h>
#include <mach/irqs.h>
#include <mach/sdhci.h>
@@ -230,12 +231,25 @@ static void harmony_keys_init(void)
tegra_gpio_enable(harmony_gpio_keys_buttons[i].gpio);
}
-static struct tegra_wm8903_platform_data harmony_audio_pdata = {
+static struct tegra_asoc_platform_data harmony_audio_pdata = {
.gpio_spkr_en = TEGRA_GPIO_SPKR_EN,
.gpio_hp_det = TEGRA_GPIO_HP_DET,
.gpio_hp_mute = -1,
.gpio_int_mic_en = TEGRA_GPIO_INT_MIC_EN,
.gpio_ext_mic_en = TEGRA_GPIO_EXT_MIC_EN,
+ .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 harmony_audio_device = {