diff options
| author | Vinod G <vinodg@nvidia.com> | 2011-01-13 19:57:20 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:45:25 -0800 |
| commit | 1f73600e4af534a37ba09a364f051a5790fac833 (patch) | |
| tree | 5124b473f9c2b8d2947c45fd1440701219c4ba5c /arch/arm/mach-tegra/board-aruba.c | |
| parent | 6ef57c9bc431397653772b323faab81d5da86a7d (diff) | |
[arm/tegra] Enable audio device in T30
audio device is enabled in the device file
Original-Change-Id: Id19526c0be5d77c25e81cb1e75648288174fadd0
Reviewed-on: http://git-master/r/15910
Reviewed-by: Scott Peterson <speterson@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
Tested-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
Original-Change-Id: I3eaf368150a62df38683f79c10180078a57052c3
Rebase-Id: R1f3ac596f387001bcf77bc2d96e45a41cde8fb4b
Diffstat (limited to 'arch/arm/mach-tegra/board-aruba.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-aruba.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-aruba.c b/arch/arm/mach-tegra/board-aruba.c index 963058b8a1ad..c25cb219c044 100644 --- a/arch/arm/mach-tegra/board-aruba.c +++ b/arch/arm/mach-tegra/board-aruba.c @@ -165,13 +165,11 @@ static __initdata struct tegra_clk_init_table aruba_clk_init_table[] = { { NULL, NULL, 0, 0}, }; -#if 0 // !!!CHECKME !!! static struct i2c_board_info __initdata aruba_i2c_bus1_board_info[] = { { I2C_BOARD_INFO("wm8903", 0x1a), }, }; -#endif static struct tegra_ulpi_config aruba_ehci2_ulpi_phy_config = { .reset_gpio = TEGRA_GPIO_PV1, @@ -230,6 +228,17 @@ static struct tegra_i2c_platform_data aruba_i2c5_platform_data = { .bus_clk_rate = { 100000, 0 }, }; +static struct tegra_audio_platform_data tegra_audio_pdata[] = { + [0] = { + .dma_on = true, /* use dma by default */ + .i2s_clk_rate = 240000000, + .dap_clk = "clk_dev1", + .audio_sync_clk = "audio_2x", + .mode = I2S_BIT_FORMAT_I2S, + .fifo_fmt = I2S_FIFO_16_LSB, + .bit_size = I2S_BIT_SIZE_16, + }, +}; static void aruba_i2c_init(void) { @@ -239,6 +248,8 @@ static void aruba_i2c_init(void) tegra_i2c_device4.dev.platform_data = &aruba_i2c4_platform_data; tegra_i2c_device5.dev.platform_data = &aruba_i2c5_platform_data; + i2c_register_board_info(0, aruba_i2c_bus1_board_info, 1); + platform_device_register(&tegra_i2c_device5); platform_device_register(&tegra_i2c_device4); platform_device_register(&tegra_i2c_device3); @@ -390,6 +401,7 @@ static struct platform_device *aruba_devices[] __initdata = { #endif &aruba_keys_device, &tegra_wdt_device, + &tegra_audio_device, #if defined(CONFIG_SND_HDA_TEGRA) &tegra_hda_device, #endif @@ -490,6 +502,7 @@ static void __init tegra_aruba_init(void) tegra_clk_init_from_table(aruba_clk_init_table); aruba_pinmux_init(); + tegra_audio_device.dev.platform_data = &tegra_audio_pdata[0]; tegra_ehci2_device.dev.platform_data = &aruba_ehci2_ulpi_platform_data; platform_add_devices(aruba_devices, ARRAY_SIZE(aruba_devices)); |