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 4bfa10b374ad8b2306f052d1ee75fb5f8e4dfe1a..6849b3dcabac4afbbcfcacf2a94f1889d74f6acc 100644 (file)
--- a/arch/arm/mach-uniphier/board_late_init.c
+++ b/arch/arm/mach-uniphier/board_late_init.c
@@ -10,7 +10,9 @@
 #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 "init.h"
@@ -37,7 +39,7 @@ static int uniphier_set_fdt_file(void)
        char dtb_name[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);
@@ -55,7 +57,7 @@ static int uniphier_set_fdt_file(void)
 
        strncat(dtb_name, ".dtb", buf_len);
 
-       return setenv("fdt_file", dtb_name);
+       return env_set("fdt_file", dtb_name);
 }
 
 int board_late_init(void)
@@ -65,20 +67,20 @@ int board_late_init(void)
        switch (uniphier_boot_device_raw()) {
        case BOOT_DEVICE_MMC1:
                printf("eMMC Boot");
-               setenv("bootmode", "emmcboot");
+               env_set("bootmode", "emmcboot");
                break;
        case BOOT_DEVICE_NAND:
                printf("NAND Boot");
-               setenv("bootmode", "nandboot");
+               env_set("bootmode", "nandboot");
                nand_denali_wp_disable();
                break;
        case BOOT_DEVICE_NOR:
                printf("NOR Boot");
-               setenv("bootmode", "norboot");
+               env_set("bootmode", "norboot");
                break;
        case BOOT_DEVICE_USB:
                printf("USB Boot");
-               setenv("bootmode", "usbboot");
+               env_set("bootmode", "usbboot");
                break;
        default:
                printf("Unknown");
@@ -92,7 +94,7 @@ int board_late_init(void)
        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;
 }