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

[karo-tx-uboot.git] / board / compulab / trimslice / trimslice.c

diff --git a/board/compulab/trimslice/trimslice.c b/board/compulab/trimslice/trimslice.c
index 8401100b188255d8f457e79b668f3cd9cfba2f68..723293fef35af7aa3f35588a7d54694da732d1ba 100644 (file)
--- a/board/compulab/trimslice/trimslice.c
+++ b/board/compulab/trimslice/trimslice.c
@@ -2,23 +2,7 @@
  *  (C) Copyright 2010-2012
  *  NVIDIA Corporation <www.nvidia.com>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -36,7 +20,7 @@ void pin_mux_usb(void)
         * USB1 internal/external mux GPIO, which masquerades as a VBUS GPIO
         * in the current device tree.
         */
-       pinmux_tristate_disable(PINGRP_UAC);
+       pinmux_tristate_disable(PMUX_PINGRP_UAC);
 }
 
 void pin_mux_spi(void)
@@ -54,5 +38,5 @@ void pin_mux_mmc(void)
        funcmux_select(PERIPH_ID_SDMMC4, FUNCMUX_SDMMC4_ATB_GMA_4_BIT);
 
        /* For CD GPIO PP1 */
-       pinmux_tristate_disable(PINGRP_DAP3);
+       pinmux_tristate_disable(PMUX_PINGRP_DAP3);
 }