diff options
| author | Sayak Ghosh Choudhury <sayakc@nvidia.com> | 2011-09-28 17:52:55 +0530 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2011-09-30 02:14:50 -0700 |
| commit | 77cc6416030481b98084e594c4787f34314054f3 (patch) | |
| tree | 9107e88039c9554daede20f3d3772f515335d69d | |
| parent | 6e605c46d10ae729d3de069052ee4fe33b88ad55 (diff) | |
arch: arm: cardhu:Support d-mic and headset mic
onboard d-mic as well as mic jack for headset mic
are available. Both mics can be supported
simultaneously and one of them will be selected as
per application request and availability of
headset mic.
BUG 834328
Change-Id: I78a48e7c53ecc8f6ffdfdfa51a44cb7e2f23d9be
Reviewed-on: http://git-master/r/54708
Tested-by: Sayak Choudhury <sayakc@nvidia.com>
Reviewed-by: Sumit Bhattacharya <sumitb@nvidia.com>
Reviewed-by: Scott Peterson <speterson@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/audio_jack.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/audio_jack.c b/arch/arm/mach-tegra/audio_jack.c index 74acf642c8a3..af35f1eeda34 100644 --- a/arch/arm/mach-tegra/audio_jack.c +++ b/arch/arm/mach-tegra/audio_jack.c @@ -41,7 +41,7 @@ int __init audio_wired_jack_init(void) int ret; tegra_gpio_enable(audio_wr_jack_conf.hp_det_n); - + tegra_gpio_enable(audio_wr_jack_conf.cdc_irq); ret = platform_device_register(&audio_hs_jack_device); return ret; } diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c index a378931faebf..52cde3283b60 100644 --- a/arch/arm/mach-tegra/board-cardhu.c +++ b/arch/arm/mach-tegra/board-cardhu.c @@ -209,6 +209,8 @@ static __initdata struct tegra_clk_init_table cardhu_clk_init_table[] = { { "blink", "clk_32k", 32768, true}, { "pll_a", NULL, 552960000, false}, { "pll_a_out0", NULL, 12288000, false}, + { "extern1", "pll_a_out0", 0, true}, + { "clk_out_1", "extern1", 0, true}, { "d_audio", "pll_a_out0", 12288000, false}, { NULL, NULL, 0, 0}, }; |