Merge tag 'u-boot-atmel-fixes-2021.01-b' of https://gitlab.denx.de/u-boot/custodians...

[platform/kernel/u-boot.git] / board / toradex / colibri_t30 / colibri_t30.c

diff --git a/board/toradex/colibri_t30/colibri_t30.c b/board/toradex/colibri_t30/colibri_t30.c
index f4bc7d8..20cbb75 100644 (file)
--- a/board/toradex/colibri_t30/colibri_t30.c
+++ b/board/toradex/colibri_t30/colibri_t30.c
@@ -1,16 +1,44 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- *  (C) Copyright 2014
+ *  (C) Copyright 2014-2016
  *  Stefan Agner <stefan@agner.ch>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/arch/pinmux.h>
+#include <init.h>
 #include <asm/arch/gp_padctrl.h>
-#include "pinmux-config-colibri_t30.h"
-#include <i2c.h>
+#include <asm/arch/pinmux.h>
+#include <asm/arch-tegra/ap.h>
+#include <asm/arch-tegra/tegra.h>
 #include <asm/gpio.h>
+#include <asm/io.h>
+#include <i2c.h>
+#include <linux/delay.h>
+#include "pinmux-config-colibri_t30.h"
+#include "../common/tdx-common.h"
+
+int arch_misc_init(void)
+{
+       if (readl(NV_PA_BASE_SRAM + NVBOOTINFOTABLE_BOOTTYPE) ==
+           NVBOOTTYPE_RECOVERY)
+               printf("USB recovery mode\n");
+
+       return 0;
+}
+
+int checkboard(void)
+{
+       puts("Model: Toradex Colibri T30 1GB\n");
+
+       return 0;
+}
+
+#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
+int ft_board_setup(void *blob, struct bd_info *bd)
+{
+       return ft_common_board_setup(blob, bd);
+}
+#endif
 
 /*
  * Routine: pinmux_init
@@ -30,13 +58,33 @@ void pinmux_init(void)
 }
 
 /*
+ * Disable RS232 serial transceiver ForceOFF# pins on Iris
+ */
+void gpio_early_init_uart(void)
+{
+       gpio_request(TEGRA_GPIO(X, 6), "Force OFF# X13");
+       gpio_direction_output(TEGRA_GPIO(X, 6), 1);
+       gpio_request(TEGRA_GPIO(X, 7), "Force OFF# X14");
+       gpio_direction_output(TEGRA_GPIO(X, 7), 1);
+}
+
+/*
  * Enable AX88772B USB to LAN controller
  */
 void pin_mux_usb(void)
 {
        /* Reset ASIX using LAN_RESET */
-       gpio_request(GPIO_PDD0, "LAN_RESET");
-       gpio_direction_output(GPIO_PDD0, 0);
+       gpio_request(TEGRA_GPIO(DD, 0), "LAN_RESET");
+       gpio_direction_output(TEGRA_GPIO(DD, 0), 0);
        udelay(5);
-       gpio_set_value(GPIO_PDD0, 1);
+       gpio_set_value(TEGRA_GPIO(DD, 0), 1);
+}
+
+/*
+ * Backlight off before OS handover
+ */
+void board_preboot_os(void)
+{
+       gpio_request(TEGRA_GPIO(V, 2), "BL_ON");
+       gpio_direction_output(TEGRA_GPIO(V, 2), 0);
 }