diff options
| author | Manoj Gangwal <mgangwal@nvidia.com> | 2013-06-19 15:59:10 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:27:50 -0700 |
| commit | 94ac66335c760e87503ebe2d4834d12023ddf611 (patch) | |
| tree | 379ba92bf33c41a3bbb5176e5679548c096cd886 | |
| parent | b7c405763bdeee2e4e80c6946820d7a6d0bf3998 (diff) | |
arch: arm: tegra: Fix aic326x register issue
1) Fix aic326x register issue on pluto
2) Fix aic326x machine driver to register on K3.8
Bug 1306842
Bug 1308447
Change-Id: I8ef02189adffc2c0238aabc063c6f6c6fce87f50
Signed-off-by: Manoj Gangwal <mgangwal@nvidia.com>
Reviewed-on: http://git-master/r/243324
Reviewed-by: Mandar Padmawar <mpadmawar@nvidia.com>
Tested-by: Mandar Padmawar <mpadmawar@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
| -rw-r--r-- | arch/arm/mach-tegra/board-pluto.c | 8 | ||||
| -rw-r--r-- | sound/soc/tegra/tegra_aic326x.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/board-pluto.c b/arch/arm/mach-tegra/board-pluto.c index 85033d9e9a38..3a933ed04478 100644 --- a/arch/arm/mach-tegra/board-pluto.c +++ b/arch/arm/mach-tegra/board-pluto.c @@ -343,13 +343,11 @@ static void pluto_i2c_init(void) #endif platform_device_register(&tegra11_i2c_device2); platform_device_register(&tegra11_i2c_device1); - - i2c_register_board_info(0, &pluto_codec_a2220_info, 1); - i2c_register_board_info(0, &cs42l73_board_info, 1); - i2c_register_board_info(0, &pluto_codec_aic326x_info, 1); pluto_i2c_bus3_board_info[0].irq = gpio_to_irq(TEGRA_GPIO_PW2); i2c_register_board_info(0, pluto_i2c_bus3_board_info, 1); i2c_register_board_info(0, &pluto_codec_aic326x_info, 1); + i2c_register_board_info(0, &pluto_codec_a2220_info, 1); + i2c_register_board_info(0, &cs42l73_board_info, 1); } static struct platform_device *pluto_uart_devices[] __initdata = { @@ -599,13 +597,13 @@ static struct platform_device *pluto_devices[] __initdata = { &tegra_i2s_device4, &tegra_spdif_device, &spdif_dit_device, + &pluto_audio_aic326x_device, &bluetooth_dit_device, &baseband_dit_device, #if defined(CONFIG_TEGRA_WAKEUP_MONITOR) &pluto_tegra_wakeup_monitor_device, #endif &pluto_audio_device, - &pluto_audio_aic326x_device, &tegra_hda_device, #if defined(CONFIG_CRYPTO_DEV_TEGRA_AES) &tegra_aes_device, diff --git a/sound/soc/tegra/tegra_aic326x.c b/sound/soc/tegra/tegra_aic326x.c index 16ef3b9145e7..cdbf2cb14039 100644 --- a/sound/soc/tegra/tegra_aic326x.c +++ b/sound/soc/tegra/tegra_aic326x.c @@ -1409,6 +1409,7 @@ static struct snd_soc_dai_link tegra_aic326x_dai[] = { .name = "VOICE CALL", .stream_name = "VOICE CALL PCM", .codec_name = "tlv320aic3262-codec", + .platform_name = "tegra30-i2s.0", .cpu_dai_name = "dit-hifi", .codec_dai_name = "aic326x-asi3", .ops = &tegra_aic326x_voice_call_ops, @@ -1417,6 +1418,7 @@ static struct snd_soc_dai_link tegra_aic326x_dai[] = { .name = "BT VOICE CALL", .stream_name = "BT VOICE CALL PCM", .codec_name = "spdif-dit.2", + .platform_name = "tegra30-i2s.3", .cpu_dai_name = "dit-hifi", .codec_dai_name = "dit-hifi", .ops = &tegra_aic326x_bt_voice_call_ops, |