diff options
| author | Sumit Bhattacharya <sumitb@nvidia.com> | 2011-11-15 15:41:44 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:50:06 -0800 |
| commit | e95c2e5a4300dc384fcd99d7dcc49e7093d6b941 (patch) | |
| tree | ce25a7cd8334dd06b7baa734719f82809f9260c8 /arch/arm/mach-tegra/board-enterprise-pinmux.c | |
| parent | 8491d6d3a967ab0070891e5a68efd90aa36d9765 (diff) | |
ARM: Tegra: Don't switch to DAP2-HDA path
SND_HDA_CODEC_REALTEK config by default gets enabled when SND_HDA_INEL
config is enabled. Just enabling realek HDA codec compilation flag
does not mean board has same installed. Remove code which switches
DAP2-I2s21 path to DAP2-HDA based on CONFIG_SND_HDA_CODEC_REALTEK
check.
Bug 872652
Signed-off-by: Sumit Bhattacharya <sumitb@nvidia.com>
Change-Id: I5334d156ed50dfa37fa4b5b6b2e1f34049b762a0
Reviewed-on: http://git-master/r/64402
Tested-by: Sumit Bhattacharya <sumitb@nvidia.com>
Reviewed-by: Scott Peterson <speterson@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Rebase-Id: Rd8d2a638041c18f4e04e58423a45eb4efad4c9d9
Diffstat (limited to 'arch/arm/mach-tegra/board-enterprise-pinmux.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-enterprise-pinmux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-enterprise-pinmux.c b/arch/arm/mach-tegra/board-enterprise-pinmux.c index 4bc7a92320f9..0e5f5498b255 100644 --- a/arch/arm/mach-tegra/board-enterprise-pinmux.c +++ b/arch/arm/mach-tegra/board-enterprise-pinmux.c @@ -285,12 +285,12 @@ static __initdata struct tegra_pingroup_config enterprise_pinmux[] = { DEFAULT_PINMUX(DAP1_SCLK, I2S0, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(CLK1_REQ, DAP, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(CLK1_OUT, EXTPERIPH1, NORMAL, NORMAL, INPUT), -#ifdef CONFIG_SND_HDA_CODEC_REALTEK +#if 0 /* For HDA realtek Codec */ DEFAULT_PINMUX(SPDIF_IN, DAP2, PULL_DOWN, NORMAL, INPUT), #else DEFAULT_PINMUX(SPDIF_IN, SPDIF, NORMAL, NORMAL, INPUT), #endif -#ifdef CONFIG_SND_HDA_CODEC_REALTEK +#if 0 /* For HDA realtek Codec */ DEFAULT_PINMUX(DAP2_FS, HDA, PULL_DOWN, NORMAL, INPUT), DEFAULT_PINMUX(DAP2_DIN, HDA, PULL_DOWN, NORMAL, INPUT), DEFAULT_PINMUX(DAP2_DOUT, HDA, PULL_DOWN, NORMAL, INPUT), |