ARM: uniphier: compute SSCPLL values more precisely

[u-boot] / arch / arm / mach-uniphier / board_late_init.c

diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c
index f23295fbd2128016318a72368d62facba60e6e2a..6849b3dcabac4afbbcfcacf2a94f1889d74f6acc 100644 (file)
--- a/arch/arm/mach-uniphier/board_late_init.c
+++ b/arch/arm/mach-uniphier/board_late_init.c
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2014      Panasonic Corporation
+ * Copyright (C) 2015-2016 Socionext Inc.
+ *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
@@ -8,10 +10,12 @@
 #include <spl.h>
 #include <libfdt.h>
 #include <nand.h>
+#include <stdio.h>
 #include <linux/io.h>
+#include <linux/printk.h>
 #include <../drivers/mtd/nand/denali.h>
 
-#include "boot-mode/boot-device.h"
+#include "init.h"
 
 static void nand_denali_wp_disable(void)
 {
@@ -28,68 +32,69 @@ static void nand_denali_wp_disable(void)
 #endif
 }
 
-#define VENDOR_PREFIX          "socionext,"
-#define DTB_FILE_PREFIX                "uniphier-"
-
 static int uniphier_set_fdt_file(void)
 {
        DECLARE_GLOBAL_DATA_PTR;
        const char *compat;
        char dtb_name[256];
-       int buf_len = 256;
+       int buf_len = sizeof(dtb_name);
 
-       if (getenv("fdt_file"))
+       if (env_get("fdt_file"))
                return 0;       /* do nothing if it is already set */
 
        compat = fdt_stringlist_get(gd->fdt_blob, 0, "compatible", 0, NULL);
        if (!compat)
                return -EINVAL;
 
-       if (strncmp(compat, VENDOR_PREFIX, strlen(VENDOR_PREFIX)))
+       /* rip off the vendor prefix "socionext,"  */
+       compat = strchr(compat, ',');
+       if (!compat)
                return -EINVAL;
+       compat++;
 
-       compat += strlen(VENDOR_PREFIX);
-
-       strncat(dtb_name, DTB_FILE_PREFIX, buf_len);
-       buf_len -= strlen(DTB_FILE_PREFIX);
-
-       strncat(dtb_name, compat, buf_len);
+       strncpy(dtb_name, compat, buf_len);
        buf_len -= strlen(compat);
 
        strncat(dtb_name, ".dtb", buf_len);
 
-       return setenv("fdt_file", dtb_name);
+       return env_set("fdt_file", dtb_name);
 }
 
 int board_late_init(void)
 {
        puts("MODE:  ");
 
-       switch (spl_boot_device_raw()) {
+       switch (uniphier_boot_device_raw()) {
        case BOOT_DEVICE_MMC1:
-               printf("eMMC Boot\n");
-               setenv("bootmode", "emmcboot");
+               printf("eMMC Boot");
+               env_set("bootmode", "emmcboot");
                break;
        case BOOT_DEVICE_NAND:
-               printf("NAND Boot\n");
-               setenv("bootmode", "nandboot");
+               printf("NAND Boot");
+               env_set("bootmode", "nandboot");
                nand_denali_wp_disable();
                break;
        case BOOT_DEVICE_NOR:
-               printf("NOR Boot\n");
-               setenv("bootmode", "norboot");
+               printf("NOR Boot");
+               env_set("bootmode", "norboot");
                break;
        case BOOT_DEVICE_USB:
-               printf("USB Boot\n");
-               setenv("bootmode", "usbboot");
+               printf("USB Boot");
+               env_set("bootmode", "usbboot");
                break;
        default:
-               printf("Unknown\n");
+               printf("Unknown");
                break;
        }
 
+       if (uniphier_have_internal_stm())
+               printf(" (STM: %s)",
+                      uniphier_boot_from_backend() ? "OFF" : "ON");
+
+       printf("\n");
+
        if (uniphier_set_fdt_file())
-               printf("fdt_file environment was not set correctly\n");
+               pr_warn("fdt_file environment was not set correctly\n");
 
        return 0;
 }