arm: tegra: cardhu/enterprise: Remove pinmux conflicts
Laxman Dewangan [Mon, 30 Jan 2012 13:00:35 +0000 (18:00 +0530)]
Remove the pinmux conflicts by moving the unused pins
in reserved options.

bug 920706

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/78172
(cherry picked from commit fb30d2d39e39f2effb7ea39ea6d9ff16d55de99c)

Change-Id: Ieea78535a58707dec9dc9dbe74c6ec25a40d2b26
Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com>
Reviewed-on: http://git-master/r/79978
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>

Rebase-Id: R3cb162730796ad90a2b9059032e3da6cf515c28f

Rebase-Id: R34682e1ad3252076ad3c5f9e7a1687faa62b9d95

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

index 44b45a0..f448a54 100644 (file)
@@ -381,7 +381,7 @@ static __initdata struct tegra_pingroup_config enterprise_unused_pinmux[] = {
        DEFAULT_PINMUX(GMI_CS6_N,       GMI,             PULL_DOWN,    TRISTATE,  OUTPUT),
        DEFAULT_PINMUX(GMI_CS7_N,       GMI,             PULL_DOWN,    TRISTATE,  OUTPUT),
        DEFAULT_PINMUX(GMI_CLK,         GMI,             NORMAL,       TRISTATE,  OUTPUT),
-       DEFAULT_PINMUX(GMI_DQS,         GMI,             PULL_DOWN,    TRISTATE,  OUTPUT),
+       DEFAULT_PINMUX(GMI_DQS,         RSVD3,           PULL_DOWN,    TRISTATE,  OUTPUT),
        DEFAULT_PINMUX(GMI_RST_N,       GMI,             PULL_DOWN,    TRISTATE,  OUTPUT),
        DEFAULT_PINMUX(GMI_WAIT,        GMI,             PULL_DOWN,    TRISTATE,  OUTPUT),
        DEFAULT_PINMUX(GMI_WP_N,        GMI,             PULL_DOWN,    TRISTATE,  OUTPUT),