diff options
| author | Colin Cross <ccross@android.com> | 2011-03-19 03:38:08 +0100 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-03-19 03:38:08 +0100 |
| commit | 84abf6084704673ae80a2105bf63ece5eee3edd5 (patch) | |
| tree | b65d3fab2b7e86935f9248053d741ed91f68b6b3 /arch/arm/mach-tegra/board-seaboard-pinmux.c | |
| parent | Merge branch 'for-2639/i2c/i2c-tegra' of git://git.fluff.org/bjdooks/linux in... (diff) | |
| parent | Merge branch 'trimslice/upstream' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | linux-84abf6084704673ae80a2105bf63ece5eee3edd5.tar.xz linux-84abf6084704673ae80a2105bf63ece5eee3edd5.zip | |
Merge branch 'boards-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra-2.6 into for-next
Diffstat (limited to 'arch/arm/mach-tegra/board-seaboard-pinmux.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-seaboard-pinmux.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/board-seaboard-pinmux.c b/arch/arm/mach-tegra/board-seaboard-pinmux.c index 2d6ad83ed4b2..0bda495e9742 100644 --- a/arch/arm/mach-tegra/board-seaboard-pinmux.c +++ b/arch/arm/mach-tegra/board-seaboard-pinmux.c @@ -161,11 +161,12 @@ static __initdata struct tegra_pingroup_config seaboard_pinmux[] = { static struct tegra_gpio_table gpio_table[] = { - { .gpio = TEGRA_GPIO_PI5, .enable = true }, /* mmc2 cd */ - { .gpio = TEGRA_GPIO_PH1, .enable = true }, /* mmc2 wp */ - { .gpio = TEGRA_GPIO_PI6, .enable = true }, /* mmc2 pwr */ - { .gpio = TEGRA_GPIO_LIDSWITCH, .enable = true }, /* lid switch */ - { .gpio = TEGRA_GPIO_POWERKEY, .enable = true }, /* power key */ + { .gpio = TEGRA_GPIO_SD2_CD, .enable = true }, + { .gpio = TEGRA_GPIO_SD2_WP, .enable = true }, + { .gpio = TEGRA_GPIO_SD2_POWER, .enable = true }, + { .gpio = TEGRA_GPIO_LIDSWITCH, .enable = true }, + { .gpio = TEGRA_GPIO_POWERKEY, .enable = true }, + { .gpio = TEGRA_GPIO_ISL29018_IRQ, .enable = true }, }; void __init seaboard_pinmux_init(void) |