X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=arch%2Farm%2Fmach-uniphier%2Fboards.c;h=d9a8d2f28aef92f1fd4399318a29c1f35d285a3f;hb=876ddb558db72d6729603a8e1f8ef35750638260;hp=79b1d2013a0e97c64f16729122acf44efc200d7a;hpb=cbe7706ab8aab06c18edaa9b120371f9c8012728;p=oweals%2Fu-boot.git diff --git a/arch/arm/mach-uniphier/boards.c b/arch/arm/mach-uniphier/boards.c index 79b1d2013a..d9a8d2f28a 100644 --- a/arch/arm/mach-uniphier/boards.c +++ b/arch/arm/mach-uniphier/boards.c @@ -1,51 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015-2016 Socionext Inc. * Author: Masahiro Yamada - * - * SPDX-License-Identifier: GPL-2.0+ */ #include -#include +#include #include #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_ch[0] = { - .base = 0x80000000, .size = 0x10000000, .width = 16, }, .dram_ch[1] = { - .base = 0x90000000, .size = 0x10000000, .width = 16, }, @@ -57,14 +31,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, }, @@ -73,14 +44,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, }, @@ -90,14 +58,11 @@ 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_ch[0] = { - .base = 0x80000000, .size = 0x10000000, .width = 16, }, .dram_ch[1] = { - .base = 0x90000000, .size = 0x10000000, .width = 16, }, @@ -108,14 +73,11 @@ static const struct uniphier_board_data uniphier_sld8_data = { #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, }, @@ -125,19 +87,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, }, @@ -147,138 +105,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_ref_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, - }, - .flags = UNIPHIER_BD_BOARD_LD20_REF, -}; - -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, - }, - .flags = UNIPHIER_BD_BOARD_LD20_GLOBAL, -}; - -static const struct uniphier_board_data uniphier_ld21_data = { - .dram_freq = 1866, - .dram_nr_ch = 2, - .dram_ch[0] = { - .base = 0x80000000, - .size = 0x20000000, - .width = 32, - }, - .dram_ch[1] = { - .base = 0xc0000000, - .size = 0x40000000, - .width = 32, - }, - .flags = UNIPHIER_BD_BOARD_LD21_GLOBAL, -}; -#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-ld21", &uniphier_ld21_data, }, - { "socionext,ph1-ld20-ref", &uniphier_ld20_ref_data, }, - { "socionext,ph1-ld20", &uniphier_ld20_data, }, + { "socionext,uniphier-ld6b", &uniphier_ld6b_data, }, #endif };