summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-enterprise-pinmux.c
diff options
context:
space:
mode:
authorRakesh Goyal <rgoyal@nvidia.com>2011-06-23 10:56:52 +0530
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:47:33 -0800
commit5b1b7057aafddc10ebb92b047841ff68e14baa53 (patch)
treed62c297c714f46d1683ba0b31777408ce9b34d88 /arch/arm/mach-tegra/board-enterprise-pinmux.c
parentabce66243916dba129efcc431f1cc53ee606c635 (diff)
arm: tegra: enterprise: enabling active lowpower for bt
Configuring correct pinmux. platform_device_add for bluesleep. this feature will be enabled with CONFIG_BT_BLUESLEEP. bug 841489 Original-Change-Id: Ib2e86b4090e0e0b1b8256a32b049f6741d8d2648 Reviewed-on: http://git-master/r/38015 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com> Rebase-Id: Rb8ccadc62fbba8e27c9c1a121a3f1d95220b9c7a
Diffstat (limited to 'arch/arm/mach-tegra/board-enterprise-pinmux.c')
-rw-r--r--arch/arm/mach-tegra/board-enterprise-pinmux.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-enterprise-pinmux.c b/arch/arm/mach-tegra/board-enterprise-pinmux.c
index a38552a83a3b..a9a8e1a61c39 100644
--- a/arch/arm/mach-tegra/board-enterprise-pinmux.c
+++ b/arch/arm/mach-tegra/board-enterprise-pinmux.c
@@ -210,7 +210,7 @@ static __initdata struct tegra_pingroup_config enterprise_pinmux[] = {
DEFAULT_PINMUX(LCD_D4, DISPLAYA, NORMAL, NORMAL, INPUT),
DEFAULT_PINMUX(LCD_D5, DISPLAYA, NORMAL, NORMAL, INPUT),
DEFAULT_PINMUX(LCD_D6, RSVD1, NORMAL, NORMAL, INPUT),
- DEFAULT_PINMUX(LCD_D7, DISPLAYA, NORMAL, NORMAL, INPUT),
+ DEFAULT_PINMUX(LCD_D7, RSVD1, NORMAL, NORMAL, OUTPUT),
DEFAULT_PINMUX(LCD_D8, DISPLAYA, NORMAL, NORMAL, INPUT),
DEFAULT_PINMUX(LCD_D9, DISPLAYA, NORMAL, NORMAL, INPUT),
DEFAULT_PINMUX(LCD_D10, DISPLAYA, NORMAL, NORMAL, INPUT),
@@ -286,6 +286,7 @@ static __initdata struct tegra_pingroup_config enterprise_pinmux[] = {
DEFAULT_PINMUX(KB_ROW1, KBC, PULL_UP, NORMAL, INPUT),
DEFAULT_PINMUX(KB_ROW2, KBC, PULL_UP, NORMAL, INPUT),
DEFAULT_PINMUX(KB_ROW3, KBC, PULL_UP, NORMAL, INPUT),
+ DEFAULT_PINMUX(KB_ROW10, RSVD1, NORMAL, NORMAL, INPUT),
DEFAULT_PINMUX(KB_COL0, KBC, PULL_UP, NORMAL, INPUT),
DEFAULT_PINMUX(KB_COL1, KBC, PULL_UP, NORMAL, INPUT),
DEFAULT_PINMUX(KB_COL2, KBC, PULL_UP, NORMAL, INPUT),