diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 18:15:30 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 18:15:30 +0200 |
| commit | 107532920226a37e595697959b2a6a823cfa2497 (patch) | |
| tree | 7d35c84ed324e6cabeed29282f1fc97994fd204b /arch/arm/mach-tegra/board-trimslice-pinmux.c | |
| parent | 29ea35969b92a4be122a58c4aceea8c5e2c388d9 (diff) | |
| parent | ecb7b0e33e048e63d1169e6fee277430c70ddf0b (diff) | |
| download | talos-obmc-linux-107532920226a37e595697959b2a6a823cfa2497.tar.gz talos-obmc-linux-107532920226a37e595697959b2a6a823cfa2497.zip | |
Merge branch 'tegra/devel' into next/devel
Diffstat (limited to 'arch/arm/mach-tegra/board-trimslice-pinmux.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-trimslice-pinmux.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-trimslice-pinmux.c b/arch/arm/mach-tegra/board-trimslice-pinmux.c index 47c596cdbf32..8417ba77f765 100644 --- a/arch/arm/mach-tegra/board-trimslice-pinmux.c +++ b/arch/arm/mach-tegra/board-trimslice-pinmux.c @@ -22,6 +22,7 @@ #include "gpio-names.h" #include "board-trimslice.h" +#include "devices.h" static __initdata struct tegra_pingroup_config trimslice_pinmux[] = { {TEGRA_PINGROUP_ATA, TEGRA_MUX_IDE, TEGRA_PUPD_NORMAL, TEGRA_TRI_TRISTATE}, @@ -142,6 +143,11 @@ static __initdata struct tegra_pingroup_config trimslice_pinmux[] = { {TEGRA_PINGROUP_XM2D, TEGRA_MUX_NONE, TEGRA_PUPD_NORMAL, TEGRA_TRI_NORMAL}, }; +static struct platform_device *pinmux_devices[] = { + &tegra_gpio_device, + &tegra_pinmux_device, +}; + 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 */ @@ -152,6 +158,7 @@ static struct tegra_gpio_table gpio_table[] = { void __init trimslice_pinmux_init(void) { + platform_add_devices(pinmux_devices, ARRAY_SIZE(pinmux_devices)); tegra_pinmux_config_table(trimslice_pinmux, ARRAY_SIZE(trimslice_pinmux)); tegra_gpio_config(gpio_table, ARRAY_SIZE(gpio_table)); } |
