diff options
| author | Kasoju Mallikarjun <mkasoju@nvidia.com> | 2011-05-04 19:12:36 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-05-05 00:27:54 -0700 |
| commit | da7662be73073945588b82cef19630b39f30bf20 (patch) | |
| tree | cf7f91853662250900be9742c34218258226fe3f /arch/arm/mach-tegra/board-enterprise.c | |
| parent | e705e6b448791ef938a0897755205cdde72fa361 (diff) | |
arm: tegra: enterprise: Fix build issue
Fixed build issue resulted from Audio BT SCO support.
Change-Id: I2f8c79699e44337767526d52df7b4343a154c92d
Reviewed-on: http://git-master/r/30387
Tested-by: Mallikarjun Kasoju <mkasoju@nvidia.com>
Reviewed-by: Scott Peterson <speterson@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-enterprise.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-enterprise.c | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/board-enterprise.c b/arch/arm/mach-tegra/board-enterprise.c index c681ef2dfe99..e59eda6d783a 100644 --- a/arch/arm/mach-tegra/board-enterprise.c +++ b/arch/arm/mach-tegra/board-enterprise.c @@ -167,6 +167,7 @@ static __initdata struct tegra_clk_init_table enterprise_clk_init_table[] = { { "pll_a_out0", NULL, 11289600, false}, { "i2s1", "pll_a_out0", 11289600, false}, { "i2s2", "pll_a_out0", 11289600, false}, + { "i2s3", "pll_a_out0", 11289600, false}, { "d_audio","pll_a_out0", 11289600, false}, { NULL, NULL, 0, 0}, }; @@ -245,7 +246,7 @@ static struct tegra_i2c_platform_data enterprise_i2c5_platform_data = { .bus_clk_rate = { 100000, 0 }, }; -static struct tegra_audio_platform_data tegra_audio_pdata[] = { +static struct tegra_audio_platform_data tegra_i2s_pdata[] = { [0] = { .i2s_master = true, .dma_on = true, /* use dma by default */ @@ -255,8 +256,19 @@ static struct tegra_audio_platform_data tegra_audio_pdata[] = { .mode = AUDIO_FRAME_FORMAT_I2S, .fifo_fmt = AUDIO_FIFO_PACK_16, .bit_size = AUDIO_BIT_SIZE_16, - .i2s_bus_width = 32, - .dsp_bus_width = 16, + .i2s_bus_width = 32, + .dsp_bus_width = 16, + }, + [1] = { + .i2s_master = true, + .dma_on = true, /* use dma by default */ + .i2s_master_clk = 8000, + .dev_clk_rate = 1024000, + .mode = AUDIO_FRAME_FORMAT_DSP, + .fifo_fmt = AUDIO_FIFO_NOP, + .bit_size = AUDIO_BIT_SIZE_16, + .i2s_bus_width = 32, + .dsp_bus_width = 16, }, }; @@ -334,7 +346,8 @@ static struct platform_device *enterprise_devices[] __initdata = { &tegra_smmu_device, #endif &tegra_wdt_device, - &tegra_audio_device, + &tegra_i2s_device1, + &tegra_i2s_device3, &tegra_spdif_device, &tegra_avp_device, &tegra_camera, @@ -466,7 +479,8 @@ static void __init tegra_enterprise_init(void) enterprise_i2c_init(); snprintf(serial, sizeof(serial), "%llx", tegra_chip_uid()); andusb_plat.serial_number = kstrdup(serial, GFP_KERNEL); - tegra_audio_device.dev.platform_data = &tegra_audio_pdata[0]; + tegra_i2s_device1.dev.platform_data = &tegra_i2s_pdata[0]; + tegra_i2s_device3.dev.platform_data = &tegra_i2s_pdata[1]; tegra_spdif_device.dev.platform_data = &tegra_spdif_pdata; platform_add_devices(enterprise_devices, ARRAY_SIZE(enterprise_devices)); enterprise_sdhci_init(); |