arm: am33xx: Add support for mulitiple PLL input frequencies

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

diff --git a/arch/arm/mach-uniphier/boards.c b/arch/arm/mach-uniphier/boards.c
index 059645171a721abb56edd43f5dad7ad3e9da320c..e3b933502230489e374354b127eb0cc0355bee58 100644 (file)
--- a/arch/arm/mach-uniphier/boards.c
+++ b/arch/arm/mach-uniphier/boards.c
@@ -16,36 +16,30 @@ 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,
        },
+       .flags = UNIPHIER_BD_DRAM_SPARSE,
 };
 #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 +51,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 +64,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 +78,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 +93,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 +107,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,19 +125,15 @@ 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,
        },
@@ -169,14 +143,11 @@ static const struct uniphier_board_data uniphier_ld6b_data = {
 #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,
        },
@@ -186,19 +157,15 @@ static const struct uniphier_board_data uniphier_ld11_data = {
 #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,
        },
@@ -207,19 +174,15 @@ static const struct uniphier_board_data uniphier_ld20_ref_data = {
 
 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,
        },
@@ -228,18 +191,15 @@ static const struct uniphier_board_data uniphier_ld20_data = {
 
 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,
+       .flags = UNIPHIER_BD_DRAM_SPARSE | UNIPHIER_BD_BOARD_LD21_GLOBAL,
 };
 #endif