diff options
author | Stefano Babic <sbabic@denx.de> | 2014-04-29 17:41:19 +0200 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2014-04-29 17:41:19 +0200 |
commit | 3deb22a4844cbda1a05c60dd29d8926e4dddaa4e (patch) | |
tree | 767063f0d9e0acfd7445db47abf0d4ac94abdc1d /board/toradex/colibri_t20_iris | |
parent | 3b31605aef069d183a9d0c1e3aa6f957503cd56b (diff) | |
parent | c9aab0f9dd23fddcebf5984dc19e62b514e759a7 (diff) | |
download | u-boot-imx-3deb22a4844cbda1a05c60dd29d8926e4dddaa4e.zip u-boot-imx-3deb22a4844cbda1a05c60dd29d8926e4dddaa4e.tar.gz u-boot-imx-3deb22a4844cbda1a05c60dd29d8926e4dddaa4e.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/toradex/colibri_t20_iris')
-rw-r--r-- | board/toradex/colibri_t20_iris/colibri_t20_iris.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/toradex/colibri_t20_iris/colibri_t20_iris.c b/board/toradex/colibri_t20_iris/colibri_t20_iris.c index f5f0475..49c74f3 100644 --- a/board/toradex/colibri_t20_iris/colibri_t20_iris.c +++ b/board/toradex/colibri_t20_iris/colibri_t20_iris.c @@ -19,7 +19,7 @@ void pin_mux_usb(void) colibri_t20_common_pin_mux_usb(); /* USB 1 aka Tegra USB port 3 VBus*/ - pinmux_tristate_disable(PINGRP_SPIG); + pinmux_tristate_disable(PMUX_PINGRP_SPIG); } #endif @@ -31,6 +31,6 @@ void pin_mux_usb(void) void pin_mux_mmc(void) { funcmux_select(PERIPH_ID_SDMMC4, FUNCMUX_SDMMC4_ATB_GMA_4_BIT); - pinmux_tristate_disable(PINGRP_GMB); + pinmux_tristate_disable(PMUX_PINGRP_GMB); } #endif |