From 0ef8a43b078dc63d2f1bf69c9d6ee480bdcbb6e7 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Fri, 25 Jul 2014 21:53:00 +0200 Subject: apalis/colibri t30: use hda hdmi audio and split sound init Use HDA HDMI audio now on Colibri T30 as well allowing for up to 7.1 multi-channel playback. Split board sound initialisation between Apalis and Colibri T30 in order to distinguish better between default SPDIF being supported out-of-the-box on Apalis vs. this being an optional feature for the Colibri. Therefore remove SPDIF for the Colibri T30. While at it add csus clock required for vi_sensor camera master clock on Apalis T30 and clk_out_2/extern2 for Colibri T30, fix debug UART1 initialisation, get rid of spurious CONFIG_SND_USB enable and further clean-up both board platform data files. --- sound/soc/tegra/Kconfig | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'sound/soc/tegra/Kconfig') diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig index a47a746a2b7e..8a9a04318399 100644 --- a/sound/soc/tegra/Kconfig +++ b/sound/soc/tegra/Kconfig @@ -87,6 +87,18 @@ config SND_SOC_TEGRA_WM8903 boards using the WM8093 codec. Currently, the supported boards are Harmony, Ventana, Seaboard, Kaen, and Aebl. +config SND_SOC_TEGRA_APALIS_T30 + tristate "SoC Audio support for Apalis T30 modules" + depends on I2C && MACH_APALIS_T30 && SND_SOC_TEGRA + select SND_SOC_SGTL5000 + select SND_SOC_SPDIF + select SND_SOC_TEGRA30_DAM + select SND_SOC_TEGRA30_I2S + select SND_SOC_TEGRA30_SPDIF + help + Say Y or M here if you want to add support for SoC audio on the + Toradex Apalis T30 modules. + config SND_SOC_TEGRA_COLIBRI_T20 tristate "SoC Audio support for Colibri T20 module" depends on SND_SOC_TEGRA && MACH_COLIBRI_T20 @@ -99,16 +111,14 @@ config SND_SOC_TEGRA_COLIBRI_T20 Toradex Colibri T20 module. config SND_SOC_TEGRA_COLIBRI_T30 - tristate "SoC Audio support for Apalis/Colibri T30 modules" - depends on I2C && (MACH_APALIS_T30 || MACH_COLIBRI_T30) && SND_SOC_TEGRA + tristate "SoC Audio support for Colibri T30 modules" + depends on I2C && MACH_COLIBRI_T30 && SND_SOC_TEGRA select SND_SOC_SGTL5000 - select SND_SOC_SPDIF select SND_SOC_TEGRA30_DAM select SND_SOC_TEGRA30_I2S - select SND_SOC_TEGRA30_SPDIF help Say Y or M here if you want to add support for SoC audio on the - Toradex Apalis/Colibri T30 modules. + Toradex Colibri T30 modules. config SND_SOC_TEGRA_TRIMSLICE tristate "SoC Audio support for TrimSlice board" -- cgit v1.2.3