tegra: video: Rename CONFIG_VIDEO_TEGRA to CONFIG_VIDEO_TEGRA20

[u-boot] / board / toradex / colibri_t20 / colibri_t20.c

diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c
index 81d344ca0469704a77a25d22e640f3c944ef2760..879f25a5384bfa7bcda5d9452c14f034ec4c9f72 100644 (file)
--- a/board/toradex/colibri_t20/colibri_t20.c
+++ b/board/toradex/colibri_t20/colibri_t20.c
@@ -13,9 +13,47 @@
 #include <asm/arch-tegra/tegra.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <i2c.h>
+
+#define PMU_I2C_ADDRESS                0x34
+#define MAX_I2C_RETRY          3
+#define PMU_SUPPLYENE          0x14
+#define PMU_SUPPLYENE_SYSINEN  (1<<5)
+#define PMU_SUPPLYENE_EXITSLREQ        (1<<1)
 
 int arch_misc_init(void)
 {
+       /* Disable PMIC sleep mode on low supply voltage */
+       struct udevice *dev;
+       u8 addr, data[1];
+       int err;
+
+       err = i2c_get_chip_for_busnum(0, PMU_I2C_ADDRESS, 1, &dev);
+       if (err) {
+               debug("%s: Cannot find PMIC I2C chip\n", __func__);
+               return err;
+       }
+
+       addr = PMU_SUPPLYENE;
+
+       err = dm_i2c_read(dev, addr, data, 1);
+       if (err) {
+               debug("failed to get PMU_SUPPLYENE\n");
+               return err;
+       }
+
+       data[0] &= ~PMU_SUPPLYENE_SYSINEN;
+       data[0] |= PMU_SUPPLYENE_EXITSLREQ;
+
+       err = dm_i2c_write(dev, addr, data, 1);
+       if (err) {
+               debug("failed to set PMU_SUPPLYENE\n");
+               return err;
+       }
+
+       /* make sure SODIMM pin 87 nRESET_OUT is released properly */
+       pinmux_set_func(PMUX_PINGRP_ATA, PMUX_FUNC_GMI);
+
        if (readl(NV_PA_BASE_SRAM + NVBOOTINFOTABLE_BOOTTYPE) ==
            NVBOOTTYPE_RECOVERY)
                printf("USB recovery mode\n");
@@ -76,7 +114,7 @@ void pin_mux_usb(void)
 }
 #endif
 
-#ifdef CONFIG_VIDEO_TEGRA
+#ifdef CONFIG_VIDEO_TEGRA20
 /*
  * Routine: pin_mux_display
  * Description: setup the pin muxes/tristate values for the LCD interface)