Commit 48270689 authored by Moti Buskila's avatar Moti Buskila Committed by Marcin Wojtas
Browse files

plat: marvell: armada: add support for twin-die combined memory device



the twin-die combined memory device should be treated as
X8 device and not as X16 one. This patch is required to
re-enable compilation after BLE (mv-ddr-marvell) firmware upgrade.

Change-Id: I41257ff2825164ebca85a84bbb8462d7b3447b97
Signed-off-by: default avatarMoti Buskila <motib@marvell.com>
Signed-off-by: default avatarMarcin Wojtas <mw@semihalf.com>
parent 4db3a887
...@@ -46,6 +46,7 @@ static struct mv_ddr_topology_map board_topology_map = { ...@@ -46,6 +46,7 @@ static struct mv_ddr_topology_map board_topology_map = {
MV_DDR_TEMP_LOW} }, /* temperature */ MV_DDR_TEMP_LOW} }, /* temperature */
MV_DDR_32BIT_ECC_PUP8_BUS_MASK, /* subphys mask */ MV_DDR_32BIT_ECC_PUP8_BUS_MASK, /* subphys mask */
MV_DDR_CFG_DEFAULT, /* ddr configuration data source */ MV_DDR_CFG_DEFAULT, /* ddr configuration data source */
NOT_COMBINED, /* ddr twin-die combined*/
{ {0} }, /* raw spd data */ { {0} }, /* raw spd data */
{0}, /* timing parameters */ {0}, /* timing parameters */
{ /* electrical configuration */ { /* electrical configuration */
......
...@@ -46,6 +46,7 @@ static struct mv_ddr_topology_map board_topology_map = { ...@@ -46,6 +46,7 @@ static struct mv_ddr_topology_map board_topology_map = {
MV_DDR_TEMP_LOW} }, /* temperature */ MV_DDR_TEMP_LOW} }, /* temperature */
MV_DDR_32BIT_ECC_PUP8_BUS_MASK, /* subphys mask */ MV_DDR_32BIT_ECC_PUP8_BUS_MASK, /* subphys mask */
MV_DDR_CFG_DEFAULT, /* ddr configuration data source */ MV_DDR_CFG_DEFAULT, /* ddr configuration data source */
NOT_COMBINED, /* ddr twin-die combined*/
{ {0} }, /* raw spd data */ { {0} }, /* raw spd data */
{0}, /* timing parameters */ {0}, /* timing parameters */
{ /* electrical configuration */ { /* electrical configuration */
......
...@@ -58,6 +58,7 @@ static struct mv_ddr_topology_map board_topology_map = { ...@@ -58,6 +58,7 @@ static struct mv_ddr_topology_map board_topology_map = {
MV_DDR_64BIT_ECC_PUP8_BUS_MASK, /* subphys mask */ MV_DDR_64BIT_ECC_PUP8_BUS_MASK, /* subphys mask */
#endif #endif
MV_DDR_CFG_SPD, /* ddr configuration data source */ MV_DDR_CFG_SPD, /* ddr configuration data source */
NOT_COMBINED, /* ddr twin-die combined*/
{ {0} }, /* raw spd data */ { {0} }, /* raw spd data */
{0}, /* timing parameters */ {0}, /* timing parameters */
{ /* electrical configuration */ { /* electrical configuration */
......
...@@ -48,6 +48,7 @@ static struct mv_ddr_topology_map board_topology_map = { ...@@ -48,6 +48,7 @@ static struct mv_ddr_topology_map board_topology_map = {
MV_DDR_TEMP_LOW} }, /* temperature */ MV_DDR_TEMP_LOW} }, /* temperature */
MV_DDR_64BIT_BUS_MASK, /* subphys mask */ MV_DDR_64BIT_BUS_MASK, /* subphys mask */
MV_DDR_CFG_SPD, /* ddr configuration data source */ MV_DDR_CFG_SPD, /* ddr configuration data source */
NOT_COMBINED, /* ddr twin-die combined*/
{ {0} }, /* raw spd data */ { {0} }, /* raw spd data */
{0}, /* timing parameters */ {0}, /* timing parameters */
{ /* electrical configuration */ { /* electrical configuration */
......
...@@ -54,6 +54,7 @@ static struct mv_ddr_topology_map board_topology_map = { ...@@ -54,6 +54,7 @@ static struct mv_ddr_topology_map board_topology_map = {
MV_DDR_TEMP_LOW} }, /* temperature */ MV_DDR_TEMP_LOW} }, /* temperature */
MV_DDR_64BIT_BUS_MASK, /* subphys mask */ MV_DDR_64BIT_BUS_MASK, /* subphys mask */
MV_DDR_CFG_SPD, /* ddr configuration data source */ MV_DDR_CFG_SPD, /* ddr configuration data source */
NOT_COMBINED, /* ddr twin-die combined*/
{ {0} }, /* raw spd data */ { {0} }, /* raw spd data */
{0}, /* timing parameters */ {0}, /* timing parameters */
{ /* electrical configuration */ { /* electrical configuration */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment