diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-09-09 16:57:30 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:48:57 -0800 |
| commit | b8f8fbaa7428082e8f69f21a17baf2982990db79 (patch) | |
| tree | 77c29f31da275ff67fa9ed7641affecba9339db8 /arch | |
| parent | 72c7f042aa49f5672f7df4066e4400ab44439516 (diff) | |
ARM: tegra: aruba: Fix build break
Update Aruba board files to get the platform building again.
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-on: http://git-master/r/51660
(cherry picked from commit de1c664bb8581147b4b9f3691c2d75d39062e37e)
Change-Id: I920032fb43aa534bb42294455c89a74a6158d4d2
Reviewed-on: http://git-master/r/54070
Rebase-Id: Ra9ef41f81ffbaac1197c27ceefdf058a304282f5
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/board-aruba-power.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-aruba.c | 73 |
2 files changed, 78 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-aruba-power.c b/arch/arm/mach-tegra/board-aruba-power.c index 4ffe2fca9c81..4391f6f19b51 100644 --- a/arch/arm/mach-tegra/board-aruba-power.c +++ b/arch/arm/mach-tegra/board-aruba-power.c @@ -69,3 +69,8 @@ int __init aruba_regulator_init(void) tegra_init_suspend(&aruba_suspend_data); return 0; } + +void __init tegra_tsensor_init(void) +{ + /* No tsensor on FPGAs */ +} diff --git a/arch/arm/mach-tegra/board-aruba.c b/arch/arm/mach-tegra/board-aruba.c index df7d4c65598f..172e6b1b1092 100644 --- a/arch/arm/mach-tegra/board-aruba.c +++ b/arch/arm/mach-tegra/board-aruba.c @@ -42,6 +42,7 @@ #include <mach/io.h> #include <mach/i2s.h> #include <mach/audio.h> +#include <mach/tegra_das.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <mach/usb_phy.h> @@ -164,6 +165,78 @@ static __initdata struct tegra_clk_init_table aruba_clk_init_table[] = { { NULL, NULL, 0, 0}, }; +struct tegra_das_platform_data tegra_das_pdata = { + .tegra_dap_port_info_table = { + /* I2S0 <--> NULL */ + [0] = { + .dac_port = tegra_das_port_none, + .codec_type = tegra_audio_codec_type_none, + .device_property = { + .num_channels = 0, + .bits_per_sample = 0, + .rate = 0, + .master = 0, + .lrck_high_left = false, + .dac_dap_data_comm_format = 0, + }, + }, + /* I2S1 <--> Hifi Codec */ + [1] = { + .dac_port = tegra_das_port_i2s1, + .codec_type = tegra_audio_codec_type_hifi, + .device_property = { + .num_channels = 2, + .bits_per_sample = 16, + .rate = 48000, + .master = 0, + .lrck_high_left = false, + .dac_dap_data_comm_format = + dac_dap_data_format_i2s, + }, + }, + /* I2s2 <--> BB */ + [2] = { + .dac_port = tegra_das_port_i2s2, + .codec_type = tegra_audio_codec_type_baseband, + .device_property = { + .num_channels = 1, + .bits_per_sample = 16, + .rate = 16000, + .master = 0, + .lrck_high_left = true, + .dac_dap_data_comm_format = + dac_dap_data_format_dsp, + }, + }, + /* I2s3 <--> BT */ + [3] = { + .dac_port = tegra_das_port_i2s3, + .codec_type = tegra_audio_codec_type_bluetooth, + .device_property = { + .num_channels = 1, + .bits_per_sample = 16, + .rate = 8000, + .master = 0, + .lrck_high_left = false, + .dac_dap_data_comm_format = + dac_dap_data_format_dsp, + }, + }, + [4] = { + .dac_port = tegra_das_port_none, + .codec_type = tegra_audio_codec_type_none, + .device_property = { + .num_channels = 0, + .bits_per_sample = 0, + .rate = 0, + .master = 0, + .lrck_high_left = false, + .dac_dap_data_comm_format = 0, + }, + }, + }, +}; + static struct i2c_board_info __initdata aruba_i2c_bus1_board_info[] = { { I2C_BOARD_INFO("wm8903", 0x1a), |