diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-09-10 16:07:40 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-09-10 16:07:40 +0200 |
| commit | 57f321c02d2871648e883739f76d5e768f8b42cd (patch) | |
| tree | 6383c51146620e08780162b714315ec0189a68e3 /arch/arm/mach-tegra/board-colibri_t20-pinmux.c | |
| parent | d5bbf34613a877dbe3da847fa0432da8c6721e73 (diff) | |
tegra: colibri_t20: incorporate l4t-r16 changes
Incorporate L4T R16 changes from NVIDIA Ventana.
Note: USB OTG port not functional as of yet.
Diffstat (limited to 'arch/arm/mach-tegra/board-colibri_t20-pinmux.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-colibri_t20-pinmux.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-colibri_t20-pinmux.c b/arch/arm/mach-tegra/board-colibri_t20-pinmux.c index 94e0dd446a7f..64f2301b7774 100644 --- a/arch/arm/mach-tegra/board-colibri_t20-pinmux.c +++ b/arch/arm/mach-tegra/board-colibri_t20-pinmux.c @@ -48,13 +48,13 @@ } static __initdata struct tegra_drive_pingroup_config colibri_t20_drive_pinmux[] = { - DEFAULT_DRIVE(DDC), DEFAULT_DRIVE(SDIO1), DEFAULT_DRIVE(VI1), SET_DRIVE(AO1, DISABLE, ENABLE, DIV_1, 31, 31, FASTEST, FASTEST), SET_DRIVE(AT1, DISABLE, ENABLE, DIV_1, 31, 31, FASTEST, FASTEST), SET_DRIVE(DBG, DISABLE, ENABLE, DIV_1, 31, 31, FASTEST, FASTEST), + SET_DRIVE(DDC, DISABLE, ENABLE, DIV_1, 31, 31, FASTEST, FASTEST), SET_DRIVE(VI2, DISABLE, ENABLE, DIV_1, 31, 31, FASTEST, FASTEST), }; @@ -221,7 +221,9 @@ static __initdata struct tegra_pingroup_config colibri_t20_pinmux[] = { {TEGRA_PINGROUP_SLXD, TEGRA_MUX_SPI4, TEGRA_PUPD_NORMAL, TEGRA_TRI_NORMAL}, {TEGRA_PINGROUP_SLXK, TEGRA_MUX_SPI4, TEGRA_PUPD_NORMAL, TEGRA_TRI_NORMAL}, + /* GPIO K6 multiplexed ACC1_DETECT */ {TEGRA_PINGROUP_SPDI, TEGRA_MUX_RSVD, TEGRA_PUPD_NORMAL, TEGRA_TRI_TRISTATE}, + /* GPIO K5 multiplexed USB1_VBUS */ {TEGRA_PINGROUP_SPDO, TEGRA_MUX_RSVD, TEGRA_PUPD_NORMAL, TEGRA_TRI_TRISTATE}, /* X0, X1, X2, X3, X4, X5, X6 and X7 */ |