From 6728b56768d42f741c7139ff78d5e1cb6e22da7b Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Mon, 31 Aug 2015 17:15:35 +0200 Subject: apalis/colibri_t30: Add comments about i2s pin muxing/operation Add a comment about DAP FS pin mux requiring INPUT when operating as I2S slave. Add a comment about DAP SCLK requiring INPUT even when operating as I2S master. Add a comment about is_i2s_master in the platform data meaning T30 SoC is I2S master. --- arch/arm/mach-tegra/board-apalis_t30-pinmux.c | 4 +++- arch/arm/mach-tegra/board-apalis_t30.c | 2 +- arch/arm/mach-tegra/board-colibri_t30-pinmux.c | 6 +++--- arch/arm/mach-tegra/board-colibri_t30.c | 18 +++++++++--------- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/arch/arm/mach-tegra/board-apalis_t30-pinmux.c b/arch/arm/mach-tegra/board-apalis_t30-pinmux.c index 0f0b5b0ab77c..87d85207b0dd 100644 --- a/arch/arm/mach-tegra/board-apalis_t30-pinmux.c +++ b/arch/arm/mach-tegra/board-apalis_t30-pinmux.c @@ -1,7 +1,7 @@ /* * arch/arm/mach-tegra/board-apalis_t30-pinmux.c * - * Copyright (C) 2013 Toradex, Inc. + * Copyright (C) 2013-2015 Toradex, Inc. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -162,7 +162,9 @@ static __initdata struct tegra_pingroup_config apalis_t30_pinmux[] = { DEFAULT_PINMUX(DAP3_DIN, I2S2, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(DAP3_DOUT, I2S2, NORMAL, NORMAL, OUTPUT), +//requires INPUT when operating as I2S slave DEFAULT_PINMUX(DAP3_FS, I2S2, NORMAL, NORMAL, OUTPUT), +//requires INPUT even when operating as I2S master DEFAULT_PINMUX(DAP3_SCLK, I2S2, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(DAP4_DIN, RSVD1, PULL_DOWN, TRISTATE, OUTPUT), /* NC */ diff --git a/arch/arm/mach-tegra/board-apalis_t30.c b/arch/arm/mach-tegra/board-apalis_t30.c index 0c97d11ede6e..08c0dd28bc61 100644 --- a/arch/arm/mach-tegra/board-apalis_t30.c +++ b/arch/arm/mach-tegra/board-apalis_t30.c @@ -73,7 +73,7 @@ static struct tegra_asoc_platform_data apalis_t30_audio_sgtl5000_pdata = { tegra_i2s_device plus one if HDA codec is activated as well */ .i2s_mode = TEGRA_DAIFMT_I2S, - .is_i2s_master = 1, + .is_i2s_master = 1, /* meaning T30 SoC is I2S master */ .sample_size = 16, }, }; diff --git a/arch/arm/mach-tegra/board-colibri_t30-pinmux.c b/arch/arm/mach-tegra/board-colibri_t30-pinmux.c index a4f21cfe6e25..16207d94a338 100644 --- a/arch/arm/mach-tegra/board-colibri_t30-pinmux.c +++ b/arch/arm/mach-tegra/board-colibri_t30-pinmux.c @@ -1,7 +1,7 @@ /* * arch/arm/mach-tegra/board-colibri_t30-pinmux.c * - * Copyright (c) 2012-2014 Toradex, Inc. + * Copyright (c) 2012-2015 Toradex, Inc. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -177,10 +177,10 @@ static __initdata struct tegra_pingroup_config colibri_t30_pinmux[] = { DEFAULT_PINMUX(DAP2_SCLK, GMI, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(DAP3_DIN, I2S2, NORMAL, NORMAL, INPUT), -// DEFAULT_PINMUX(DAP3_DOUT, I2S2, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(DAP3_DOUT, I2S2, NORMAL, NORMAL, OUTPUT), -// DEFAULT_PINMUX(DAP3_FS, I2S2, NORMAL, NORMAL, INPUT), +//requires INPUT when operating as I2S slave DEFAULT_PINMUX(DAP3_FS, I2S2, NORMAL, NORMAL, OUTPUT), +//requires INPUT even when operating as I2S master DEFAULT_PINMUX(DAP3_SCLK, I2S2, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(DAP4_DIN, GMI, NORMAL, NORMAL, INPUT), diff --git a/arch/arm/mach-tegra/board-colibri_t30.c b/arch/arm/mach-tegra/board-colibri_t30.c index ae3252442974..7265d8d463ec 100644 --- a/arch/arm/mach-tegra/board-colibri_t30.c +++ b/arch/arm/mach-tegra/board-colibri_t30.c @@ -63,25 +63,25 @@ /* Audio */ static struct tegra_asoc_platform_data colibri_t30_audio_sgtl5000_pdata = { - .gpio_spkr_en = -1, + .gpio_ext_mic_en = -1, .gpio_hp_det = -1, .gpio_hp_mute = -1, .gpio_int_mic_en = -1, - .gpio_ext_mic_en = -1, + .gpio_spkr_en = -1, + .i2s_param[BASEBAND] = { + .audio_port_id = -1, + }, + .i2s_param[BT_SCO] = { + .audio_port_id = -1, + }, .i2s_param[HIFI_CODEC] = { .audio_port_id = 1, /* index of below registered tegra_i2s_device plus one if HDA codec is activated as well */ .i2s_mode = TEGRA_DAIFMT_I2S, - .is_i2s_master = 1, + .is_i2s_master = 1, /* meaning T30 SoC is I2S master */ .sample_size = 16, }, - .i2s_param[BASEBAND] = { - .audio_port_id = -1, - }, - .i2s_param[BT_SCO] = { - .audio_port_id = -1, - }, }; static struct platform_device colibri_t30_audio_sgtl5000_device = { -- cgit v1.2.3