diff options
| author | Rakesh Goyal <rgoyal@nvidia.com> | 2012-03-07 16:21:45 +0530 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-03-07 22:34:22 -0800 |
| commit | aff70bae074faf404b6644a95b0cab308199be52 (patch) | |
| tree | 186cfd5a0106c9b9c0d0fa7056b7d2b7a1e6b23c /arch/arm/mach-tegra/board-kai-pinmux.c | |
| parent | 806c13eb6bda41bdceb65ae7478b08965e1a4d5d (diff) | |
arm: tegra: kai nfc support
1) configure pinmux
2) create pn544_i2c_platform_data
3) register i2c device info using i2c_register_board_info
Bug 949128
Change-Id: I62c82d338724c4f012ac98d7ec61ec9aae1afae5
Signed-off-by: Rakesh Goyal <rgoyal@nvidia.com>
Reviewed-on: http://git-master/r/88288
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-kai-pinmux.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-kai-pinmux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-kai-pinmux.c b/arch/arm/mach-tegra/board-kai-pinmux.c index 713ecf9d988d..1bc64bdb1558 100644 --- a/arch/arm/mach-tegra/board-kai-pinmux.c +++ b/arch/arm/mach-tegra/board-kai-pinmux.c @@ -354,7 +354,7 @@ static __initdata struct tegra_pingroup_config kai_pinmux_common[] = { DEFAULT_PINMUX(GMI_CS3_N, RSVD1, NORMAL, NORMAL, INPUT), /* OTHERS */ - DEFAULT_PINMUX(KB_ROW3, KBC, NORMAL, TRISTATE, OUTPUT), + DEFAULT_PINMUX(KB_ROW3, KBC, NORMAL, NORMAL, OUTPUT), DEFAULT_PINMUX(GMI_DQS, RSVD1, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(GMI_AD15, RSVD1, PULL_UP, NORMAL, OUTPUT), |