libfdt: move headers to <linux/libfdt.h> and <linux/libfdt_env.h>

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

diff --git a/arch/arm/mach-uniphier/boards.c b/arch/arm/mach-uniphier/boards.c
index ed308f3ecba0d4c2efc839ea02f46de7a29ac859..104ed90fe920d07853e098c3cd4099a6c8ff9563 100644 (file)
--- a/arch/arm/mach-uniphier/boards.c
+++ b/arch/arm/mach-uniphier/boards.c
@@ -1,54 +1,30 @@
 /*
- * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2015-2016 Socionext Inc.
+ *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
-#include <libfdt.h>
+#include <linux/libfdt.h>
 #include <linux/kernel.h>
 
 #include "init.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if defined(CONFIG_ARCH_UNIPHIER_SLD3)
-static const struct uniphier_board_data uniphier_sld3_data = {
-       .dram_freq = 1600,
-       .dram_nr_ch = 3,
-       .dram_ch[0] = {
-               .base = 0x80000000,
-               .size = 0x20000000,
-               .width = 32,
-       },
-       .dram_ch[1] = {
-               .base = 0xc0000000,
-               .size = 0x20000000,
-               .width = 16,
-       },
-       .dram_ch[2] = {
-               .base = 0xc0000000,
-               .size = 0x10000000,
-               .width = 16,
-       },
-};
-#endif
-
 #if defined(CONFIG_ARCH_UNIPHIER_LD4)
 static const struct uniphier_board_data uniphier_ld4_data = {
        .dram_freq = 1600,
-       .dram_nr_ch = 2,
-       .dram_ddr3plus = true,
        .dram_ch[0] = {
-               .base = 0x80000000,
                .size = 0x10000000,
                .width = 16,
        },
        .dram_ch[1] = {
-               .base = 0x90000000,
                .size = 0x10000000,
                .width = 16,
        },
+       .flags = UNIPHIER_BD_DDR3PLUS,
 };
 #endif
 
@@ -56,14 +32,11 @@ static const struct uniphier_board_data uniphier_ld4_data = {
 /* 1GB RAM board */
 static const struct uniphier_board_data uniphier_pro4_data = {
        .dram_freq = 1600,
-       .dram_nr_ch = 2,
        .dram_ch[0] = {
-               .base = 0x80000000,
                .size = 0x20000000,
                .width = 32,
        },
        .dram_ch[1] = {
-               .base = 0xa0000000,
                .size = 0x20000000,
                .width = 32,
        },
@@ -72,14 +45,11 @@ static const struct uniphier_board_data uniphier_pro4_data = {
 /* 2GB RAM board */
 static const struct uniphier_board_data uniphier_pro4_2g_data = {
        .dram_freq = 1600,
-       .dram_nr_ch = 2,
        .dram_ch[0] = {
-               .base = 0x80000000,
                .size = 0x40000000,
                .width = 32,
        },
        .dram_ch[1] = {
-               .base = 0xc0000000,
                .size = 0x40000000,
                .width = 32,
        },
@@ -89,32 +59,26 @@ static const struct uniphier_board_data uniphier_pro4_2g_data = {
 #if defined(CONFIG_ARCH_UNIPHIER_SLD8)
 static const struct uniphier_board_data uniphier_sld8_data = {
        .dram_freq = 1333,
-       .dram_nr_ch = 2,
-       .dram_ddr3plus = true,
        .dram_ch[0] = {
-               .base = 0x80000000,
                .size = 0x10000000,
                .width = 16,
        },
        .dram_ch[1] = {
-               .base = 0x90000000,
                .size = 0x10000000,
                .width = 16,
        },
+       .flags = UNIPHIER_BD_DDR3PLUS,
 };
 #endif
 
 #if defined(CONFIG_ARCH_UNIPHIER_PRO5)
 static const struct uniphier_board_data uniphier_pro5_data = {
        .dram_freq = 1866,
-       .dram_nr_ch = 2,
        .dram_ch[0] = {
-               .base = 0x80000000,
                .size = 0x20000000,
                .width = 32,
        },
        .dram_ch[1] = {
-               .base = 0xa0000000,
                .size = 0x20000000,
                .width = 32,
        },
@@ -124,19 +88,15 @@ static const struct uniphier_board_data uniphier_pro5_data = {
 #if defined(CONFIG_ARCH_UNIPHIER_PXS2)
 static const struct uniphier_board_data uniphier_pxs2_data = {
        .dram_freq = 2133,
-       .dram_nr_ch = 3,
        .dram_ch[0] = {
-               .base = 0x80000000,
                .size = 0x40000000,
                .width = 32,
        },
        .dram_ch[1] = {
-               .base = 0xc0000000,
                .size = 0x20000000,
                .width = 32,
        },
        .dram_ch[2] = {
-               .base = 0xe0000000,
                .size = 0x20000000,
                .width = 16,
        },
@@ -146,98 +106,46 @@ static const struct uniphier_board_data uniphier_pxs2_data = {
 #if defined(CONFIG_ARCH_UNIPHIER_LD6B)
 static const struct uniphier_board_data uniphier_ld6b_data = {
        .dram_freq = 1866,
-       .dram_nr_ch = 3,
        .dram_ch[0] = {
-               .base = 0x80000000,
                .size = 0x40000000,
                .width = 32,
        },
        .dram_ch[1] = {
-               .base = 0xc0000000,
                .size = 0x20000000,
                .width = 32,
        },
        .dram_ch[2] = {
-               .base = 0xe0000000,
                .size = 0x20000000,
                .width = 16,
        },
 };
 #endif
 
-#if defined(CONFIG_ARCH_UNIPHIER_LD11)
-static const struct uniphier_board_data uniphier_ld11_data = {
-       .dram_freq = 1600,
-       .dram_nr_ch = 2,
-       .dram_ch[0] = {
-               .base = 0x80000000,
-               .size = 0x20000000,
-               .width = 16,
-       },
-       .dram_ch[1] = {
-               .base = 0xa0000000,
-               .size = 0x20000000,
-               .width = 16,
-       },
-};
-#endif
-
-#if defined(CONFIG_ARCH_UNIPHIER_LD20)
-static const struct uniphier_board_data uniphier_ld20_data = {
-       .dram_freq = 1866,
-       .dram_nr_ch = 3,
-       .dram_ch[0] = {
-               .base = 0x80000000,
-               .size = 0x40000000,
-               .width = 32,
-       },
-       .dram_ch[1] = {
-               .base = 0xc0000000,
-               .size = 0x40000000,
-               .width = 32,
-       },
-       .dram_ch[2] = {
-               .base = 0x100000000UL,
-               .size = 0x40000000,
-               .width = 32,
-       },
-};
-#endif
-
 struct uniphier_board_id {
        const char *compatible;
        const struct uniphier_board_data *param;
 };
 
 static const struct uniphier_board_id uniphier_boards[] = {
-#if defined(CONFIG_ARCH_UNIPHIER_SLD3)
-       { "socionext,ph1-sld3", &uniphier_sld3_data, },
-#endif
 #if defined(CONFIG_ARCH_UNIPHIER_LD4)
-       { "socionext,ph1-ld4", &uniphier_ld4_data, },
+       { "socionext,uniphier-ld4", &uniphier_ld4_data, },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_PRO4)
-       { "socionext,ph1-pro4-ace", &uniphier_pro4_2g_data, },
-       { "socionext,ph1-pro4-sanji", &uniphier_pro4_2g_data, },
-       { "socionext,ph1-pro4", &uniphier_pro4_data, },
+       { "socionext,uniphier-pro4-ace", &uniphier_pro4_2g_data, },
+       { "socionext,uniphier-pro4-sanji", &uniphier_pro4_2g_data, },
+       { "socionext,uniphier-pro4", &uniphier_pro4_data, },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_SLD8)
-       { "socionext,ph1-sld8", &uniphier_sld8_data, },
+       { "socionext,uniphier-sld8", &uniphier_sld8_data, },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_PRO5)
-       { "socionext,ph1-pro5", &uniphier_pro5_data, },
+       { "socionext,uniphier-pro5", &uniphier_pro5_data, },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_PXS2)
-       { "socionext,proxstream2", &uniphier_pxs2_data, },
+       { "socionext,uniphier-pxs2", &uniphier_pxs2_data, },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_LD6B)
-       { "socionext,ph1-ld6b", &uniphier_ld6b_data, },
-#endif
-#if defined(CONFIG_ARCH_UNIPHIER_LD11)
-       { "socionext,ph1-ld11", &uniphier_ld11_data, },
-#endif
-#if defined(CONFIG_ARCH_UNIPHIER_LD20)
-       { "socionext,ph1-ld20", &uniphier_ld20_data, },
+       { "socionext,uniphier-ld6b", &uniphier_ld6b_data, },
 #endif
 };