diff options
| author | Jon Mayo <jmayo@nvidia.com> | 2011-03-04 16:40:59 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-04-26 15:53:24 -0700 |
| commit | 7ac8e9e681c312f331f177fc8f23c0b0819a94d5 (patch) | |
| tree | 545f0e7a711082dbb414d89cc8748dce5c0c4fe4 /arch/arm/mach-tegra/board-cardhu-pinmux.c | |
| parent | 390f4c265a5ab04e24e065affefa5f6f14fc7098 (diff) | |
tegra: cardhu: disable NAND pinmux and enable PWM0
disable all NAND pins, and enable PWM0 pins for backlight.
Bug 786163
Original-Change-Id: I7cb978946d5f0acdfb708738d39cfcaf945fda98
Reviewed-on: http://git-master/r/21746
Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
Tested-by: Jonathan Mayo <jmayo@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Change-Id: Iea6456e10f460c55894c4b63d42402e50f4c0242
Diffstat (limited to 'arch/arm/mach-tegra/board-cardhu-pinmux.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu-pinmux.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-pinmux.c b/arch/arm/mach-tegra/board-cardhu-pinmux.c index 6b372ff8eedc..2cba6eeff761 100644 --- a/arch/arm/mach-tegra/board-cardhu-pinmux.c +++ b/arch/arm/mach-tegra/board-cardhu-pinmux.c @@ -256,7 +256,7 @@ static __initdata struct tegra_pingroup_config cardhu_pinmux[] = { DEFAULT_PINMUX(GPIO_PU0, RSVD1, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(GPIO_PU1, RSVD1, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(GPIO_PU2, RSVD1, NORMAL, NORMAL, INPUT), - DEFAULT_PINMUX(GPIO_PU3, PWM0, NORMAL, NORMAL, OUTPUT), + DEFAULT_PINMUX(GPIO_PU3, RSVD1, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(GPIO_PU4, PWM1, NORMAL, NORMAL, OUTPUT), DEFAULT_PINMUX(GPIO_PU5, PWM2, NORMAL, NORMAL, OUTPUT), DEFAULT_PINMUX(GPIO_PU6, PWM3, NORMAL, NORMAL, OUTPUT), @@ -268,7 +268,7 @@ static __initdata struct tegra_pingroup_config cardhu_pinmux[] = { DEFAULT_PINMUX(CLK3_REQ, DEV3, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(GMI_WP_N, RSVD1, NORMAL, NORMAL, INPUT), -#if defined(CONFIG_MTD_NAND_TEGRA) +#if 0 /* for testing on Verbier */ DEFAULT_PINMUX(GMI_WAIT, NAND, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(GMI_ADV_N, NAND, NORMAL, NORMAL, OUTPUT), DEFAULT_PINMUX(GMI_CLK, NAND, NORMAL, NORMAL, OUTPUT), @@ -298,7 +298,7 @@ static __initdata struct tegra_pingroup_config cardhu_pinmux[] = { DEFAULT_PINMUX(GMI_OE_N, NAND, NORMAL, NORMAL, OUTPUT), DEFAULT_PINMUX(GMI_DQS, NAND, NORMAL, NORMAL, INPUT), #else - DEFAULT_PINMUX(GMI_CS2_N, GMI, NORMAL, NORMAL, OUTPUT), /* EN_VDD_BL1 */ + DEFAULT_PINMUX(GMI_CS2_N, RSVD1, PULL_UP, NORMAL, INPUT), /* EN_VDD_BL1 */ DEFAULT_PINMUX(GMI_AD8, PWM0, NORMAL, NORMAL, OUTPUT), /* LCD1_BL_PWM */ DEFAULT_PINMUX(GMI_AD10, NAND, NORMAL, NORMAL, OUTPUT), /* LCD1_BL_EN */ #endif |