ARM: tegra: get rid of colibri_t20-common

[oweals/u-boot.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 e40a98609f4e8a06f5fbd36d80165f2baefa0cbc..46560948a6443e47f4674bde52336b2af90d6fd0 100644 (file)
--- a/board/toradex/colibri_t20_iris/colibri_t20_iris.c
+++ b/board/toradex/colibri_t20_iris/colibri_t20_iris.c
@@ -1,46 +1,52 @@
 /*
  *  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>
-#include <asm/gpio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/funcmux.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch-tegra/board.h>
-#include <asm/arch-tegra/mmc.h>
-
-#include "../colibri_t20-common/colibri_t20-common.h"
+#include <asm/gpio.h>
 
-#ifdef CONFIG_USB_EHCI_TEGRA
-void pin_mux_usb(void)
+#ifdef CONFIG_TEGRA_MMC
+/*
+ * Routine: pin_mux_mmc
+ * Description: setup the pin muxes/tristate values for the SDMMC(s)
+ */
+void pin_mux_mmc(void)
 {
-       colibri_t20_common_pin_mux_usb();
+       funcmux_select(PERIPH_ID_SDMMC4, FUNCMUX_SDMMC4_ATB_GMA_4_BIT);
+       pinmux_tristate_disable(PMUX_PINGRP_GMB);
+}
+#endif
 
-       /* USB 1 aka Tegra USB port 3 VBus*/
-       pinmux_tristate_disable(PINGRP_SPIG);
+#ifdef CONFIG_TEGRA_NAND
+void pin_mux_nand(void)
+{
+       funcmux_select(PERIPH_ID_NDFLASH, FUNCMUX_NDFLASH_KBC_8_BIT);
 }
 #endif
 
-#ifdef CONFIG_TEGRA_MMC
-int board_mmc_init(bd_t *bd)
+#ifdef CONFIG_USB_EHCI_TEGRA
+void pin_mux_usb(void)
 {
-       funcmux_select(PERIPH_ID_SDMMC4, FUNCMUX_SDMMC4_ATB_GMA_4_BIT);
-       pinmux_tristate_disable(PINGRP_GMB);
+       /* module internal USB bus to connect ethernet chipset */
+       funcmux_select(PERIPH_ID_USB2, FUNCMUX_USB2_ULPI);
+
+       /* ULPI reference clock output */
+       pinmux_set_func(PMUX_PINGRP_CDEV2, PMUX_FUNC_PLLP_OUT4);
+       pinmux_tristate_disable(PMUX_PINGRP_CDEV2);
+
+       /* PHY reset GPIO */
+       pinmux_tristate_disable(PMUX_PINGRP_UAC);
 
-       tegra_mmc_init(0, 4, -1, GPIO_PC7);
+       /* VBus GPIO */
+       pinmux_tristate_disable(PMUX_PINGRP_DTE);
 
-       return 0;
+       /* USB 1 aka Tegra USB port 3 VBus */
+       pinmux_tristate_disable(PMUX_PINGRP_SPIG);
 }
 #endif