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

[u-boot] / arch / arm / imx-common / cpu.c

diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c
index dc6d959eae60e980f5ca4ced06e2f8d073e61f6a..632facabd70cd94bff98ea46fbb9eb731e63b114 100644 (file)
--- a/arch/arm/imx-common/cpu.c
+++ b/arch/arm/imx-common/cpu.c
@@ -10,7 +10,7 @@
 #include <bootm.h>
 #include <common.h>
 #include <netdev.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
@@ -137,6 +137,8 @@ unsigned imx_ddr_size(void)
 const char *get_imx_type(u32 imxtype)
 {
        switch (imxtype) {
+       case MXC_CPU_MX7S:
+               return "7S";    /* Single-core version of the mx7 */
        case MXC_CPU_MX7D:
                return "7D";    /* Dual-core version of the mx7 */
        case MXC_CPU_MX6QP:
@@ -157,6 +159,8 @@ const char *get_imx_type(u32 imxtype)
                return "6SX";   /* SoloX version of the mx6 */
        case MXC_CPU_MX6UL:
                return "6UL";   /* Ultra-Lite version of the mx6 */
+       case MXC_CPU_MX6ULL:
+               return "6ULL";  /* ULL version of the mx6 */
        case MXC_CPU_MX51:
                return "51";
        case MXC_CPU_MX53:
@@ -220,9 +224,9 @@ int print_cpuinfo(void)
                if (!ret)
                        printf(" at %dC\n", cpu_tmp);
                else
-                       puts(" - invalid sensor data\n");
+                       debug(" - invalid sensor data\n");
        } else {
-               puts(" - invalid sensor device\n");
+               debug(" - invalid sensor device\n");
        }
 #endif
 
@@ -279,6 +283,9 @@ void arch_preboot_os(void)
        /* disable video before launching O/S */
        ipuv3_fb_shutdown();
 #endif
+#if defined(CONFIG_VIDEO_MXS)
+       lcdif_power_down();
+#endif
 }
 
 void set_chipselect_size(int const cs_size)