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. --- arch/arm/configs/apalis_t30_defconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'arch/arm/configs/apalis_t30_defconfig') diff --git a/arch/arm/configs/apalis_t30_defconfig b/arch/arm/configs/apalis_t30_defconfig index 618d5896bec9..d219240697be 100644 --- a/arch/arm/configs/apalis_t30_defconfig +++ b/arch/arm/configs/apalis_t30_defconfig @@ -315,11 +315,10 @@ CONFIG_SND_HDA_PLATFORM_NVIDIA_TEGRA=y # CONFIG_SND_HDA_GENERIC is not set CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=10 -CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=y CONFIG_SND_SOC=y CONFIG_SND_SOC_TEGRA=y -CONFIG_SND_SOC_TEGRA_COLIBRI_T30=y +CONFIG_SND_SOC_TEGRA_APALIS_T30=y CONFIG_HIDRAW=y CONFIG_USB_HIDDEV=y CONFIG_USB=y -- cgit v1.2.3