rockchip: dts: rk3399-puma: disable 'fifo-mode' in sdmmc

[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 26dae9e92ca8a0aa5c645f9402e9cba9481c9bc3..e3b933502230489e374354b127eb0cc0355bee58 100644 (file)
--- a/arch/arm/mach-uniphier/boards.c
+++ b/arch/arm/mach-uniphier/boards.c
@@ -16,7 +16,6 @@ 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] = {
                .size = 0x20000000,
                .width = 32,
@@ -36,7 +35,6 @@ static const struct uniphier_board_data uniphier_sld3_data = {
 #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] = {
                .size = 0x10000000,
                .width = 16,
@@ -53,7 +51,6 @@ 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] = {
                .size = 0x20000000,
                .width = 32,
@@ -67,7 +64,6 @@ 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] = {
                .size = 0x40000000,
                .width = 32,
@@ -82,7 +78,6 @@ 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] = {
                .size = 0x10000000,
                .width = 16,
@@ -98,7 +93,6 @@ 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] = {
                .size = 0x20000000,
                .width = 32,
@@ -113,7 +107,6 @@ 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] = {
                .size = 0x40000000,
                .width = 32,
@@ -132,7 +125,6 @@ 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] = {
                .size = 0x40000000,
                .width = 32,
@@ -151,7 +143,6 @@ 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] = {
                .size = 0x20000000,
                .width = 16,
@@ -166,7 +157,6 @@ 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] = {
                .size = 0x40000000,
                .width = 32,
@@ -184,7 +174,6 @@ 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] = {
                .size = 0x40000000,
                .width = 32,
@@ -202,7 +191,6 @@ 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] = {
                .size = 0x20000000,
                .width = 32,
@@ -211,7 +199,7 @@ static const struct uniphier_board_data uniphier_ld21_data = {
                .size = 0x40000000,
                .width = 32,
        },
-       .flags = UNIPHIER_BD_BOARD_LD21_GLOBAL,
+       .flags = UNIPHIER_BD_DRAM_SPARSE | UNIPHIER_BD_BOARD_LD21_GLOBAL,
 };
 #endif