diff options
| author | Olof Johansson <olof@lixom.net> | 2011-03-16 23:08:22 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-03-16 23:08:22 -0700 |
| commit | 2f40ea9d0743b3cc48190e4ebf3a9f474a8833a2 (patch) | |
| tree | 16deb170fef81c11aff65d5beda92e45533ec96c /arch/arm/mach-tegra/board-trimslice-pinmux.c | |
| parent | 6f168f2fa60f87e85e0df25e87e2372f22f5eb7c (diff) | |
| parent | f02726a77960194995dac9fd218ec10b4de76cd6 (diff) | |
| download | talos-obmc-linux-2f40ea9d0743b3cc48190e4ebf3a9f474a8833a2.tar.gz talos-obmc-linux-2f40ea9d0743b3cc48190e4ebf3a9f474a8833a2.zip | |
Merge branch 'trimslice/upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/linux-tegra into boards-for-next
Diffstat (limited to 'arch/arm/mach-tegra/board-trimslice-pinmux.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-trimslice-pinmux.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-trimslice-pinmux.c b/arch/arm/mach-tegra/board-trimslice-pinmux.c index 6d4fc9f7f1fb..13534fa08abf 100644 --- a/arch/arm/mach-tegra/board-trimslice-pinmux.c +++ b/arch/arm/mach-tegra/board-trimslice-pinmux.c @@ -16,8 +16,11 @@ #include <linux/kernel.h> #include <linux/init.h> + #include <mach/pinmux.h> +#include <mach/gpio.h> +#include "gpio-names.h" #include "board-trimslice.h" static __initdata struct tegra_pingroup_config trimslice_pinmux[] = { @@ -139,7 +142,13 @@ static __initdata struct tegra_pingroup_config trimslice_pinmux[] = { {TEGRA_PINGROUP_XM2D, TEGRA_MUX_NONE, TEGRA_PUPD_NORMAL, TEGRA_TRI_NORMAL}, }; +static struct tegra_gpio_table gpio_table[] = { + { .gpio = TRIMSLICE_GPIO_SD4_CD, .enable = true }, /* mmc4 cd */ + { .gpio = TRIMSLICE_GPIO_SD4_WP, .enable = true }, /* mmc4 wp */ +}; + void __init trimslice_pinmux_init(void) { tegra_pinmux_config_table(trimslice_pinmux, ARRAY_SIZE(trimslice_pinmux)); + tegra_gpio_config(gpio_table, ARRAY_SIZE(gpio_table)); } |
