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 +- arch/arm/configs/colibri_t30_defconfig | 18 ++++- arch/arm/mach-tegra/board-apalis_t30.c | 135 ++++++++++++++++---------------- arch/arm/mach-tegra/board-colibri_t30.c | 15 ++-- 4 files changed, 90 insertions(+), 81 deletions(-) (limited to 'arch') 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 diff --git a/arch/arm/configs/colibri_t30_defconfig b/arch/arm/configs/colibri_t30_defconfig index 1ba54254a455..76784e46bdee 100644 --- a/arch/arm/configs/colibri_t30_defconfig +++ b/arch/arm/configs/colibri_t30_defconfig @@ -255,8 +255,22 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_LOGO=y CONFIG_SOUND=y CONFIG_SND=y -# CONFIG_SND_PCI is not set -CONFIG_SND_USB=y +CONFIG_SND_HDA_INTEL=y +CONFIG_SND_HDA_PLATFORM_DRIVER=y +CONFIG_SND_HDA_PLATFORM_NVIDIA_TEGRA=y +# CONFIG_SND_HDA_CODEC_REALTEK is not set +# CONFIG_SND_HDA_CODEC_ANALOG is not set +# CONFIG_SND_HDA_CODEC_SIGMATEL is not set +# CONFIG_SND_HDA_CODEC_VIA is not set +# CONFIG_SND_HDA_CODEC_CIRRUS is not set +# CONFIG_SND_HDA_CODEC_CONEXANT is not set +# CONFIG_SND_HDA_CODEC_CA0110 is not set +# CONFIG_SND_HDA_CODEC_CA0132 is not set +# CONFIG_SND_HDA_CODEC_CMEDIA is not set +# CONFIG_SND_HDA_CODEC_SI3054 is not set +# CONFIG_SND_HDA_GENERIC is not set +CONFIG_SND_HDA_POWER_SAVE=y +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=10 CONFIG_SND_USB_AUDIO=y CONFIG_SND_SOC=y CONFIG_SND_SOC_TEGRA=y diff --git a/arch/arm/mach-tegra/board-apalis_t30.c b/arch/arm/mach-tegra/board-apalis_t30.c index a10064ae73ca..a3e1ad6b1ade 100644 --- a/arch/arm/mach-tegra/board-apalis_t30.c +++ b/arch/arm/mach-tegra/board-apalis_t30.c @@ -1,7 +1,7 @@ /* * arch/arm/mach-tegra/board-apalis_t30.c * - * Copyright (c) 2013 Toradex, Inc. + * Copyright (c) 2013-2014 Toradex, Inc. * * This source code is licensed under the GNU General Public License, * Version 2. See the file COPYING for more details. @@ -50,15 +50,9 @@ #include "pm.h" #include "wakeups-t3.h" -/* ADC */ - -//TODO - /* Audio */ -/* HDA */ - -//TODO +/* HDA see sound/pci/hda/hda_intel.c */ /* I2S */ @@ -85,7 +79,7 @@ static struct tegra_asoc_platform_data apalis_t30_audio_sgtl5000_pdata = { }; static struct platform_device apalis_t30_audio_sgtl5000_device = { - .name = "tegra-snd-colibri_t30-sgtl5000", + .name = "tegra-snd-apalis_t30-sgtl5000", .id = 0, .dev = { .platform_data = &apalis_t30_audio_sgtl5000_pdata, @@ -117,14 +111,14 @@ static struct i2c_board_info camera_i2c_max9526 = { }; static struct tegra_camera_platform_data max9526_tegra_camera_platform_data = { - .disable_camera = tegra_camera_disable, - .enable_camera = tegra_camera_enable, - .flip_h = 0, - .flip_v = 0, - .port = TEGRA_CAMERA_PORT_VIP, - .internal_sync = false, - .vip_h_active_start = 0x8F, - .vip_v_active_start = 0x12, + .disable_camera = tegra_camera_disable, + .enable_camera = tegra_camera_enable, + .flip_h = 0, + .flip_v = 0, + .port = TEGRA_CAMERA_PORT_VIP, + .internal_sync = false, + .vip_h_active_start = 0x8F, + .vip_v_active_start = 0x12, }; static struct soc_camera_link iclink_max9526 = { @@ -149,14 +143,14 @@ static struct i2c_board_info camera_i2c_adv7180 = { }; static struct tegra_camera_platform_data adv7180_tegra_camera_platform_data = { - .disable_camera = tegra_camera_disable, - .enable_camera = tegra_camera_enable, - .flip_h = 0, - .flip_v = 0, - .port = TEGRA_CAMERA_PORT_VIP, - .internal_sync = false, - .vip_h_active_start = 0x8F, - .vip_v_active_start = 0x12, + .disable_camera = tegra_camera_disable, + .enable_camera = tegra_camera_enable, + .flip_h = 0, + .flip_v = 0, + .port = TEGRA_CAMERA_PORT_VIP, + .internal_sync = false, + .vip_h_active_start = 0x8F, + .vip_v_active_start = 0x12, }; static struct soc_camera_link iclink_adv7180 = { @@ -181,14 +175,14 @@ static struct i2c_board_info camera_i2c_tvp5150soc = { }; static struct tegra_camera_platform_data tvp5150soc_tegra_camera_platform_data = { - .disable_camera = tegra_camera_disable, - .enable_camera = tegra_camera_enable, - .flip_h = 0, - .flip_v = 0, - .port = TEGRA_CAMERA_PORT_VIP, - .internal_sync = false, - .vip_h_active_start = 0x8F, - .vip_v_active_start = 0x12, + .disable_camera = tegra_camera_disable, + .enable_camera = tegra_camera_enable, + .flip_h = 0, + .flip_v = 0, + .port = TEGRA_CAMERA_PORT_VIP, + .internal_sync = false, + .vip_h_active_start = 0x8F, + .vip_v_active_start = 0x12, }; static struct soc_camera_link iclink_tvp5150soc = { @@ -213,14 +207,14 @@ static struct i2c_board_info camera_i2c_ov7670soc = { }; static struct tegra_camera_platform_data ov7670_tegra_camera_platform_data = { - .disable_camera = tegra_camera_disable, - .enable_camera = tegra_camera_enable, - .flip_h = 0, - .flip_v = 0, - .port = TEGRA_CAMERA_PORT_VIP, - .internal_sync = false, - .vip_h_active_start = 0x8F, - .vip_v_active_start = 0x12, + .disable_camera = tegra_camera_disable, + .enable_camera = tegra_camera_enable, + .flip_h = 0, + .flip_v = 0, + .port = TEGRA_CAMERA_PORT_VIP, + .internal_sync = false, + .vip_h_active_start = 0x8F, + .vip_v_active_start = 0x12, }; static struct soc_camera_link iclink_ov7670soc = { @@ -245,16 +239,20 @@ static struct i2c_board_info camera_i2c_as0260soc = { }; static struct tegra_camera_platform_data as0260soc_tegra_camera_platform_data = { - .disable_camera = tegra_camera_disable, - .enable_camera = tegra_camera_enable, - .flip_h = 0, - .flip_v = 0, - .port = TEGRA_CAMERA_PORT_CSI_A, - .lanes = 2, - .continuous_clk = true, - .internal_sync = false, - .vip_h_active_start = 0, - .vip_v_active_start = 0, + .disable_camera = tegra_camera_disable, + .enable_camera = tegra_camera_enable, + .flip_h = 0, + .flip_v = 0, + .port = TEGRA_CAMERA_PORT_CSI_A, +// .port = TEGRA_CAMERA_PORT_CSI_B, +// .port = TEGRA_CAMERA_PORT_VIP, + .lanes = 2, + .continuous_clk = true, + .internal_sync = false, + .vip_h_active_start = 0, +// .vip_h_active_start = 8F, + .vip_v_active_start = 0, +// .vip_v_active_start = 12, }; static struct soc_camera_link iclink_as0260soc = { @@ -330,6 +328,8 @@ static struct tegra_clk_init_table apalis_t30_clk_init_table[] __initdata = { {"audio2", "i2s2_sync", 0, false}, {"audio3", "i2s3_sync", 0, false}, {"blink", "clk_32k", 32768, true}, + /* required for vi_sensor ? */ + {"csus", "clk_m", 0, true}, {"d_audio", "clk_m", 12000000, false}, {"dam0", "clk_m", 12000000, false}, {"dam1", "clk_m", 12000000, false}, @@ -396,7 +396,6 @@ static void apalis_t30_gpio_init(void) } } - /* * Fusion touch screen GPIOs (using Toradex display/touch adapater) * Apalis GPIO 5, MXM-11, Ixora X27-17, pen down interrupt @@ -428,7 +427,7 @@ static int pinmux_fusion_pins(void) /* GEN1_I2C: I2C1_SDA/SCL on MXM3 pin 209/211 (e.g. RTC on carrier board) */ static struct i2c_board_info apalis_t30_i2c_bus1_board_info[] __initdata = { { - /* M41T0M6 real time clock on Iris carrier board */ + /* M41T0M6 real time clock on carrier board */ I2C_BOARD_INFO("rtc-ds1307", 0x68), .type = "m41t00", }, @@ -819,24 +818,24 @@ static struct tegra_spi_device_controller_data spidev_controller_data = { static struct spi_board_info tegra_spi_devices[] __initdata = { { - .bus_num = 0, /* SPI1: Apalis SPI1 */ - .chip_select = 0, + .bus_num = 0, /* SPI1: Apalis SPI1 */ + .chip_select = 0, .controller_data = &spidev_controller_data, - .irq = 0, - .max_speed_hz = 50000000, - .modalias = "spidev", - .mode = SPI_MODE_0, - .platform_data = NULL, + .irq = 0, + .max_speed_hz = 50000000, + .modalias = "spidev", + .mode = SPI_MODE_0, + .platform_data = NULL, }, { - .bus_num = 4, /* SPI5: Apalis SPI2 */ - .chip_select = 2, + .bus_num = 4, /* SPI5: Apalis SPI2 */ + .chip_select = 2, .controller_data = &spidev_controller_data, - .irq = 0, - .max_speed_hz = 50000000, - .modalias = "spidev", - .mode = SPI_MODE_0, - .platform_data = NULL, + .irq = 0, + .max_speed_hz = 50000000, + .modalias = "spidev", + .mode = SPI_MODE_0, + .platform_data = NULL, }, }; @@ -1540,7 +1539,7 @@ static void __init apalis_t30_init(void) #ifdef CONFIG_TEGRA_WDT_RECOVERY tegra_wdt_recovery_init(); #endif - tegra_serial_debug_init(TEGRA_UARTD_BASE, INT_WDT_CPU, NULL, -1, -1); + tegra_serial_debug_init(TEGRA_UARTA_BASE, INT_WDT_CPU, NULL, -1, -1); apalis_t30_mcp2515_can_init(); apalis_t30_gpio_init(); } diff --git a/arch/arm/mach-tegra/board-colibri_t30.c b/arch/arm/mach-tegra/board-colibri_t30.c index e4cac4218f9c..8afffe4b48d6 100644 --- a/arch/arm/mach-tegra/board-colibri_t30.c +++ b/arch/arm/mach-tegra/board-colibri_t30.c @@ -69,8 +69,9 @@ static struct tegra_asoc_platform_data colibri_t30_audio_sgtl5000_pdata = { .gpio_int_mic_en = -1, .gpio_ext_mic_en = -1, .i2s_param[HIFI_CODEC] = { - .audio_port_id = 0, /* index of below registered - tegra_i2s_device */ + .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, .sample_size = 16, @@ -332,11 +333,13 @@ static struct tegra_clk_init_table colibri_t30_clk_init_table[] __initdata = { {"audio2", "i2s2_sync", 0, false}, {"audio3", "i2s3_sync", 0, false}, {"blink", "clk_32k", 32768, true}, - {"clk_out_2", "extern2", 24000000, false}, + /* optional camera clock */ + { "clk_out_2", "extern2", 24000000, false}, {"d_audio", "clk_m", 12000000, false}, {"dam0", "clk_m", 12000000, false}, {"dam1", "clk_m", 12000000, false}, {"dam2", "clk_m", 12000000, false}, + { "extern2", "clk_m", 24000000, false}, {"hda", "pll_p", 108000000, false}, {"hda2codec_2x","pll_p", 48000000, false}, {"i2c1", "pll_p", 3200000, false}, @@ -352,9 +355,7 @@ static struct tegra_clk_init_table colibri_t30_clk_init_table[] __initdata = { {"pll_a", NULL, 564480000, true}, {"pll_m", NULL, 0, false}, {"pwm", "pll_p", 3187500, false}, - {"spdif_out", "pll_a_out0", 0, false}, {"vi", "pll_p", 0, false}, - {"vi_sensor", "pll_p", 150000000, false}, {NULL, NULL, 0, 0}, }; @@ -1516,13 +1517,9 @@ static struct platform_device *colibri_t30_devices[] __initdata = { &tegra_dam_device1, &tegra_dam_device2, &tegra_i2s_device2, - &tegra_spdif_device, - &spdif_dit_device, &tegra_pcm_device, &colibri_t30_audio_sgtl5000_device, -#ifdef CONFIG_ANDROID &tegra_hda_device, -#endif &tegra_cec_device, #ifdef CONFIG_KEYBOARD_GPIO &colibri_t30_keys_device, -- cgit v1.2.3