Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / board / toradex / colibri_t20_iris / colibri_t20_iris.c

diff --git a/board/toradex/colibri_t20_iris/colibri_t20_iris.c b/board/toradex/colibri_t20_iris/colibri_t20_iris.c
index aa76f65fdef72b13dddce24567fb0b412693490c..49c74f34f1e87b9fa458703fa1a16f58d03d467a 100644 (file)
--- a/board/toradex/colibri_t20_iris/colibri_t20_iris.c
+++ b/board/toradex/colibri_t20_iris/colibri_t20_iris.c
@@ -1,16 +1,7 @@
 /*
  *  Copyright (C) 2012 Lucas Stach
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -28,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
 
@@ -40,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