diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-21 20:13:48 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-21 20:13:48 +0200 |
commit | 94b972d366c29b92319865e3ded16da062aa8507 (patch) | |
tree | 2948fd62cdd789f182775f5d7d576ac9b7b025e5 /board/nvidia/seaboard/seaboard.c | |
parent | dda0dbfc69f3d560c87f5be85f127ed862ea6721 (diff) | |
parent | d381294aef4a5b6ddeda3685519330a5b73d884f (diff) | |
download | u-boot-imx-94b972d366c29b92319865e3ded16da062aa8507.zip u-boot-imx-94b972d366c29b92319865e3ded16da062aa8507.tar.gz u-boot-imx-94b972d366c29b92319865e3ded16da062aa8507.tar.bz2 |
Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
Diffstat (limited to 'board/nvidia/seaboard/seaboard.c')
-rw-r--r-- | board/nvidia/seaboard/seaboard.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/board/nvidia/seaboard/seaboard.c b/board/nvidia/seaboard/seaboard.c index ef4e481..ce2db40 100644 --- a/board/nvidia/seaboard/seaboard.c +++ b/board/nvidia/seaboard/seaboard.c @@ -37,14 +37,14 @@ void pin_mux_mmc(void) funcmux_select(PERIPH_ID_SDMMC3, FUNCMUX_SDMMC3_SDB_4BIT); /* For power GPIO PI6 */ - pinmux_tristate_disable(PINGRP_ATA); + pinmux_tristate_disable(PMUX_PINGRP_ATA); /* For CD GPIO PI5 */ - pinmux_tristate_disable(PINGRP_ATC); + pinmux_tristate_disable(PMUX_PINGRP_ATC); } #endif void pin_mux_usb(void) { /* For USB's GPIO PD0. For now, since we have no pinmux in fdt */ - pinmux_tristate_disable(PINGRP_SLXK); + pinmux_tristate_disable(PMUX_PINGRP_SLXK); } |