ARM: Tegra: Don't switch to DAP2-HDA path
Sumit Bhattacharya [Tue, 15 Nov 2011 10:11:44 +0000 (15:11 +0530)]
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: R9c70411abf91029075facf6f22f9612cdfcdb4fd

arch/arm/mach-tegra/board-cardhu-pinmux.c

index 8d0912f..a07bd01 100644 (file)
@@ -352,13 +352,13 @@ static __initdata struct tegra_pingroup_config cardhu_pinmux_common[] = {
        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
        DEFAULT_PINMUX(SPDIF_OUT,       SPDIF,           NORMAL,    NORMAL,     OUTPUT),
-#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),