Merge branch 'master' into next

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

diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c
index b87e9e7..86b1040 100644 (file)
--- a/board/toradex/apalis-tk1/apalis-tk1.c
+++ b/board/toradex/apalis-tk1/apalis-tk1.c
@@ -5,12 +5,18 @@
 
 #include <common.h>
 #include <dm.h>
+#include <env.h>
+#include <init.h>
+#include <log.h>
 #include <asm/arch-tegra/ap.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
+#include <env_internal.h>
+#include <fdt_support.h>
 #include <pci_tegra.h>
+#include <linux/delay.h>
 #include <power/as3722.h>
 #include <power/pmic.h>
 
@@ -19,17 +25,67 @@
 
 #define LAN_DEV_OFF_N  TEGRA_GPIO(O, 6)
 #define LAN_RESET_N    TEGRA_GPIO(S, 2)
+#define FAN_EN         TEGRA_GPIO(DD, 2)
 #define LAN_WAKE_N     TEGRA_GPIO(O, 5)
 #ifdef CONFIG_APALIS_TK1_PCIE_EVALBOARD_INIT
 #define PEX_PERST_N    TEGRA_GPIO(DD, 1) /* Apalis GPIO7 */
 #define RESET_MOCI_CTRL        TEGRA_GPIO(U, 4)
 #endif /* CONFIG_APALIS_TK1_PCIE_EVALBOARD_INIT */
+#define VCC_USBH       TEGRA_GPIO(T, 6)
+#define VCC_USBH_V1_0  TEGRA_GPIO(N, 5)
+#define VCC_USBO1      TEGRA_GPIO(T, 5)
+#define VCC_USBO1_V1_0 TEGRA_GPIO(N, 4)
 
 int arch_misc_init(void)
 {
        if (readl(NV_PA_BASE_SRAM + NVBOOTINFOTABLE_BOOTTYPE) ==
-           NVBOOTTYPE_RECOVERY)
-               printf("USB recovery mode\n");
+           NVBOOTTYPE_RECOVERY) {
+               printf("USB recovery mode, attempting to boot Toradex Easy "
+                      "Installer\n");
+               env_set("bootdelay", "-2");
+               env_set("defargs", "pcie_aspm=off user_debug=30");
+               env_set("fdt_high", "");
+               env_set("initrd_high", "");
+
+               env_set("setup", "env set setupargs igb_mac=${ethaddr} "
+                       "consoleblank=0 no_console_suspend=1 "
+                       "console=${console},${baudrate}n8 ${memargs}");
+               env_set("teziargs", "rootfstype=squashfs root=/dev/ram quiet "
+                       "autoinstall");
+               env_set("vidargs", "video=HDMI-A-1:640x480-16@60D");
+               env_set("bootcmd", "run setup; env set bootargs ${defargs} "
+                       "${setupargs} ${vidargs} ${teziargs}; bootm 0x80208000"
+                       "#config@${soc}-${fdt_module}-${fdt_board}.dtb");
+       }
+
+       /* PCB Version Indication: V1.2 and later have GPIO_PV0 wired to GND */
+       gpio_request(TEGRA_GPIO(V, 0), "PCB Version Indication");
+       gpio_direction_input(TEGRA_GPIO(V, 0));
+       if (gpio_get_value(TEGRA_GPIO(V, 0))) {
+               /*
+                * if using the default device tree for new V1.2 and later HW,
+                * use version for older V1.0 and V1.1 HW
+                */
+               char *fdt_env = env_get("fdt_module");
+
+               if (fdt_env && !strcmp(FDT_MODULE, fdt_env)) {
+                       env_set("fdt_module", FDT_MODULE_V1_0);
+                       printf("patching fdt_module to " FDT_MODULE_V1_0
+                              " for older V1.0 and V1.1 HW\n");
+               }
+
+               /* activate USB power enable GPIOs */
+               gpio_request(VCC_USBH_V1_0, "VCC_USBH");
+               gpio_direction_output(VCC_USBH_V1_0, 1);
+               gpio_request(VCC_USBO1_V1_0, "VCC_USBO1");
+               gpio_direction_output(VCC_USBO1_V1_0, 1);
+       } else {
+               /* activate USB power enable GPIOs */
+               gpio_request(VCC_USBH, "VCC_USBH");
+               gpio_direction_output(VCC_USBH, 1);
+               gpio_request(VCC_USBO1, "VCC_USBO1");
+               gpio_direction_output(VCC_USBO1, 1);
+       }
 
        return 0;
 }
@@ -42,8 +98,26 @@ int checkboard(void)
 }
 
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
-int ft_board_setup(void *blob, bd_t *bd)
+int ft_board_setup(void *blob, struct bd_info *bd)
 {
+       u8 enetaddr[6];
+
+       /* MAC addr */
+       if (eth_env_get_enetaddr("ethaddr", enetaddr)) {
+               int err = fdt_find_and_setprop(blob,
+                                              "/pcie@1003000/pci@2,0/ethernet@0,0",
+                                              "local-mac-address", enetaddr, 6, 0);
+
+               /* Older device trees might have used a different node name */
+               if (err < 0)
+                       err = fdt_find_and_setprop(blob,
+                                                  "/pcie@1003000/pci@2,0/pcie@0",
+                                                  "local-mac-address", enetaddr, 6, 0);
+
+               if (err >= 0)
+                       puts("   MAC address updated...\n");
+       }
+
        return ft_common_board_setup(blob, bd);
 }
 #endif
@@ -113,7 +187,7 @@ int tegra_pcie_board_init(void)
        int ret;
 
        ret = uclass_get_device_by_driver(UCLASS_PMIC,
-                                         DM_GET_DRIVER(pmic_as3722), &dev);
+                                         DM_DRIVER_GET(pmic_as3722), &dev);
        if (ret) {
                pr_err("failed to find AS3722 PMIC: %d\n", ret);
                return ret;
@@ -152,7 +226,7 @@ void tegra_pcie_board_port_reset(struct tegra_pcie_port *port)
                int ret;
 
                ret = uclass_get_device_by_driver(UCLASS_PMIC,
-                                                 DM_GET_DRIVER(pmic_as3722),
+                                                 DM_DRIVER_GET(pmic_as3722),
                                                  &dev);
                if (ret) {
                        debug("%s: Failed to find PMIC\n", __func__);
@@ -242,6 +316,15 @@ void tegra_pcie_board_port_reset(struct tegra_pcie_port *port)
 #endif /* CONFIG_PCI_TEGRA */
 
 /*
+ * Enable/start PWM CPU fan
+ */
+void start_cpu_fan(void)
+{
+       gpio_request(FAN_EN, "FAN_EN");
+       gpio_direction_output(FAN_EN, 1);
+}
+
+/*
  * Backlight off before OS handover
  */
 void board_preboot_os(void)