summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-cardhu-pinmux.c
diff options
context:
space:
mode:
authorPrayas Mohanty <pmohanty@nvidia.com>2011-02-11 00:05:42 +0530
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:45:36 -0800
commit309cf66173575821a2322a4fc6a6af012f7b30c8 (patch)
treeac65b415a3ea9be2fdec4e020788e53fedfebbde /arch/arm/mach-tegra/board-cardhu-pinmux.c
parentfd21107491bdc812696129603a1da4a2e908055b (diff)
arm: tegra: cardhu: bringup of OV5650 on T30
Code changes in the kernel for bringup of camera on T30 on verbier and cardhu. bug 787230 Original-Change-Id: I6100cdddc14468c17ee44c6f83cb49192e578df1 Reviewed-on: http://git-master/r/18075 Tested-by: Prayas Mohanty <pmohanty@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Original-Change-Id: If995c6b796c161ffc4b4e232cc9d3cfd23c63995 Rebase-Id: Rc64a0213eb035ee6ce5f58310e3b0d23d6dcc9e8
Diffstat (limited to 'arch/arm/mach-tegra/board-cardhu-pinmux.c')
-rw-r--r--arch/arm/mach-tegra/board-cardhu-pinmux.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-pinmux.c b/arch/arm/mach-tegra/board-cardhu-pinmux.c
index 5db9c382ca4f..437ceba6acb6 100644
--- a/arch/arm/mach-tegra/board-cardhu-pinmux.c
+++ b/arch/arm/mach-tegra/board-cardhu-pinmux.c
@@ -240,7 +240,7 @@ static __initdata struct tegra_pingroup_config cardhu_pinmux[] = {
DEFAULT_PINMUX(VI_D5, SDMMC2, NORMAL, NORMAL, INPUT),
DEFAULT_PINMUX(VI_D7, SDMMC2, NORMAL, NORMAL, INPUT),
DEFAULT_PINMUX(VI_D10, RSVD1, NORMAL, NORMAL, INPUT),
- DEFAULT_PINMUX(VI_MCLK, VI, NORMAL, NORMAL, INPUT),
+ DEFAULT_PINMUX(VI_MCLK, VI, PULL_UP, NORMAL, INPUT),
DEFAULT_PINMUX(UART2_RXD, IRDA, NORMAL, NORMAL, INPUT),
DEFAULT_PINMUX(UART2_TXD, IRDA, NORMAL, NORMAL, OUTPUT),
@@ -303,7 +303,7 @@ static __initdata struct tegra_pingroup_config cardhu_pinmux[] = {
DEFAULT_PINMUX(GMI_A17, UARTD, NORMAL, NORMAL, INPUT),
DEFAULT_PINMUX(GMI_A18, UARTD, NORMAL, NORMAL, INPUT),
DEFAULT_PINMUX(GMI_A19, UARTD, NORMAL, NORMAL, OUTPUT),
- DEFAULT_PINMUX(CAM_MCLK, VI, NORMAL, NORMAL, INPUT),
+ DEFAULT_PINMUX(CAM_MCLK, VI_ALT2, PULL_UP, NORMAL, INPUT),
DEFAULT_PINMUX(GPIO_PCC1, RSVD1, NORMAL, NORMAL, INPUT),
DEFAULT_PINMUX(GPIO_PBB0, RSVD1, NORMAL, NORMAL, INPUT),
DEFAULT_PINMUX(GPIO_PBB3, VGP3, NORMAL, NORMAL, INPUT),