diff options
| author | Colin Cross <ccross@android.com> | 2011-03-18 22:38:08 -0400 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-03-18 22:38:08 -0400 |
| commit | 84abf6084704673ae80a2105bf63ece5eee3edd5 (patch) | |
| tree | b65d3fab2b7e86935f9248053d741ed91f68b6b3 /arch/arm/mach-tegra/board-seaboard-pinmux.c | |
| parent | c871fe663a6368fd0e98f5a3bfd81b0b9c591266 (diff) | |
| parent | 2f40ea9d0743b3cc48190e4ebf3a9f474a8833a2 (diff) | |
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[] = { | |||
| 161 | 161 | ||
| 162 | 162 | ||
| 163 | static struct tegra_gpio_table gpio_table[] = { | 163 | static struct tegra_gpio_table gpio_table[] = { |
| 164 | { .gpio = TEGRA_GPIO_PI5, .enable = true }, /* mmc2 cd */ | 164 | { .gpio = TEGRA_GPIO_SD2_CD, .enable = true }, |
| 165 | { .gpio = TEGRA_GPIO_PH1, .enable = true }, /* mmc2 wp */ | 165 | { .gpio = TEGRA_GPIO_SD2_WP, .enable = true }, |
| 166 | { .gpio = TEGRA_GPIO_PI6, .enable = true }, /* mmc2 pwr */ | 166 | { .gpio = TEGRA_GPIO_SD2_POWER, .enable = true }, |
| 167 | { .gpio = TEGRA_GPIO_LIDSWITCH, .enable = true }, /* lid switch */ | 167 | { .gpio = TEGRA_GPIO_LIDSWITCH, .enable = true }, |
| 168 | { .gpio = TEGRA_GPIO_POWERKEY, .enable = true }, /* power key */ | 168 | { .gpio = TEGRA_GPIO_POWERKEY, .enable = true }, |
| 169 | { .gpio = TEGRA_GPIO_ISL29018_IRQ, .enable = true }, | ||
| 169 | }; | 170 | }; |
| 170 | 171 | ||
| 171 | void __init seaboard_pinmux_init(void) | 172 | void __init seaboard_pinmux_init(void) |