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

[karo-tx-uboot.git] / board / nvidia / seaboard / seaboard.c

diff --git a/board/nvidia/seaboard/seaboard.c b/board/nvidia/seaboard/seaboard.c
index 498e5137a33d031b33e7c0e3dbcbc9d030f763aa..11472ebaf20d1eb385457cf8745322460e7b94bc 100644 (file)
--- a/board/nvidia/seaboard/seaboard.c
+++ b/board/nvidia/seaboard/seaboard.c
@@ -2,28 +2,13 @@
  *  (C) Copyright 2010,2011
  *  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>
 #include <asm/io.h>
 #include <asm/arch/tegra.h>
+#include <asm/arch-tegra/board.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/funcmux.h>
 #include <asm/arch/gpio.h>
@@ -38,7 +23,7 @@ void gpio_early_init_uart(void)
 #ifndef CONFIG_SPL_BUILD
        gpio_request(GPIO_PI3, NULL);
 #endif
-       gpio_direction_output(GPIO_PI3, 0);
+       tegra_spl_gpio_direction_output(GPIO_PI3, 0);
 }
 #endif
 
@@ -53,14 +38,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);
 }