ARM: uniphier: do not setup pins for System Bus on NAND boot mode

[oweals/u-boot.git] / 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 0622a1e16e0dfc3a63b04fa46f962538958eca66..a45412677a0ffcfad93ca01f7a6ee222471f90ce 100644 (file)
--- a/arch/arm/mach-uniphier/board_late_init.c
+++ b/arch/arm/mach-uniphier/board_late_init.c
@@ -1,16 +1,18 @@
 /*
- * Copyright (C) 2014 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <spl.h>
+#include <libfdt.h>
 #include <nand.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <../drivers/mtd/nand/denali.h>
 
+#include "boot-mode/boot-device.h"
+
 static void nand_denali_wp_disable(void)
 {
 #ifdef CONFIG_NAND_DENALI
@@ -26,11 +28,45 @@ 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 ret;
+
+       if (getenv("fdt_file"))
+               return 0;       /* do nothing if it is already set */
+
+       ret = fdt_get_string(gd->fdt_blob, 0, "compatible", &compat);
+       if (ret)
+               return -EINVAL;
+
+       if (strncmp(compat, VENDOR_PREFIX, strlen(VENDOR_PREFIX)))
+               return -EINVAL;
+
+       compat += strlen(VENDOR_PREFIX);
+
+       strncat(dtb_name, DTB_FILE_PREFIX, buf_len);
+       buf_len -= strlen(DTB_FILE_PREFIX);
+
+       strncat(dtb_name, compat, buf_len);
+       buf_len -= strlen(compat);
+
+       strncat(dtb_name, ".dtb", buf_len);
+
+       return setenv("fdt_file", dtb_name);
+}
+
 int board_late_init(void)
 {
        puts("MODE:  ");
 
-       switch (spl_boot_device()) {
+       switch (spl_boot_device_raw()) {
        case BOOT_DEVICE_MMC1:
                printf("eMMC Boot\n");
                setenv("bootmode", "emmcboot");
@@ -44,10 +80,17 @@ int board_late_init(void)
                printf("NOR Boot\n");
                setenv("bootmode", "norboot");
                break;
+       case BOOT_DEVICE_USB:
+               printf("USB Boot\n");
+               setenv("bootmode", "usbboot");
+               break;
        default:
-               printf("Unsupported Boot Mode\n");
-               return -1;
+               printf("Unknown\n");
+               break;
        }
 
+       if (uniphier_set_fdt_file())
+               printf("fdt_file environment was not set correctly\n");
+
        return 0;
 }