fdt: msys: add support in modular DT for BobK Cetus and Cealum
- add compatible name update for Cetus and Caeulum
- add update for cm3 node (status and compatible string)
- add update for SMI index(pp-smi-interface) in mdio node
Change-Id: I3e66ecedacabfcb7c504166ef54bf892d1ffc6b5
Signed-off-by: Bassel Saba <basselsa@marvell.com>
Reviewed-on: http://vgitil04.il.marvell.com:8080/23411
Reviewed-by: Omri Itach <omrii@marvell.com>
Tested-by: Omri Itach <omrii@marvell.com>
diff --git a/board/mv_ebu/msys/msys_family/boardEnv/mvBoardEnvLib.c b/board/mv_ebu/msys/msys_family/boardEnv/mvBoardEnvLib.c
index 9a5b157..51bf631 100755
--- a/board/mv_ebu/msys/msys_family/boardEnv/mvBoardEnvLib.c
+++ b/board/mv_ebu/msys/msys_family/boardEnv/mvBoardEnvLib.c
@@ -2931,7 +2931,13 @@
len += sprintf(pNameBuff + len, "marvell,msys-ac3-db") + 1;
} else if (boardId >= BOBK_MARVELL_BOARD_ID_BASE && boardId < BOBK_MARVELL_MAX_BOARD_ID) {
len += sprintf(pNameBuff + len, "marvell,msys-bobk") + 1;
- len += sprintf(pNameBuff + len, "marvell,msys-bobk-db") + 1;
+ if (boardId == BOBK_CETUS_DB_ID) {
+ len += sprintf(pNameBuff + len, "marvell,msys-bobk-cetus") + 1;
+ len += sprintf(pNameBuff + len, "marvell,msys-bobk-cetus-db") + 1;
+ } else if (boardId == BOBK_CAELUM_DB_ID) {
+ len += sprintf(pNameBuff + len, "marvell,msys-bobk-caelum") + 1;
+ len += sprintf(pNameBuff + len, "marvell,msys-bobk-caelum-db") + 1;
+ }
}
len += sprintf(pNameBuff + len, "marvell,armada-370-xp") + 1;
@@ -3107,3 +3113,41 @@
{
mvOsSPrintf(compatibleBuf, "marvell,bc2-ac3-pinctrl");
}
+
+#ifdef MV_CM3
+/*******************************************************************************
+* mvBoardIsCm3
+* DESCRIPTION:
+* checks whether CM3 is used or not
+*
+* INPUT: None
+* OUTPUT: None.
+* RETURN: MV_TRUE CM3 is used
+* MV_FALSE otherwise
+*******************************************************************************/
+MV_BOOL mvBoardIsCm3(void)
+{
+ return board->isCm3;
+}
+
+/*******************************************************************************
+* mvBoardCm3CompatibleNameGet
+*
+* DESCRIPTION:
+* This function returns the compatible string of cm3
+*
+* OUTPUT:
+* compatibleBuf - Buffer to contain cm3 compatible string
+*
+*******************************************************************************/
+void mvBoardCm3CompatibleNameGet(char *compatibleBuf)
+{
+ if (gBoardId >= BOBK_MARVELL_BOARD_ID_BASE &&
+ gBoardId < BOBK_MARVELL_MAX_BOARD_ID)
+ mvOsSPrintf(compatibleBuf, "marvell,msys-bobk-cm3");
+ else if (gBoardId >= BC2_MARVELL_BOARD_ID_BASE &&
+ gBoardId < BC2_MARVELL_MAX_BOARD_ID)
+ mvOsSPrintf(compatibleBuf, "marvell,msys-bc2-cm3");
+
+}
+#endif
diff --git a/board/mv_ebu/msys/msys_family/boardEnv/mvBoardEnvLib.h b/board/mv_ebu/msys/msys_family/boardEnv/mvBoardEnvLib.h
index df30649..1dc10d6 100755
--- a/board/mv_ebu/msys/msys_family/boardEnv/mvBoardEnvLib.h
+++ b/board/mv_ebu/msys/msys_family/boardEnv/mvBoardEnvLib.h
@@ -271,6 +271,7 @@
MV_BOOL isSdMmcConnected;
char modelName[MV_BOARD_MODEL_NAME_LEN];
+ MV_BOOL isCm3;
} MV_BOARD_INFO;
MV_VOID mvBoardEnvInit(MV_VOID);
@@ -396,6 +397,10 @@
void mvBoardGetModelName(char *pNameBuff);
MV_BOOL mvBoardIsPpSmi(void);
void mvBoardPinCtrlNameGet(char *compatibleBuf);
+#ifdef MV_CM3
+MV_BOOL mvBoardIsCm3(void);
+void mvBoardCm3CompatibleNameGet(char *compatibleBuf);
+#endif
#ifdef __cplusplus
}
diff --git a/board/mv_ebu/msys/msys_family/boardEnv/mvBoardEnvSpec.c b/board/mv_ebu/msys/msys_family/boardEnv/mvBoardEnvSpec.c
index 0e1c970..4d5bbcb 100644
--- a/board/mv_ebu/msys/msys_family/boardEnv/mvBoardEnvSpec.c
+++ b/board/mv_ebu/msys/msys_family/boardEnv/mvBoardEnvSpec.c
@@ -633,7 +633,8 @@
.norFlashWriteParams = DB_DX_BC2_BOARD_NOR_WRITE_PARAMS,
.modelName = "BobCat2 Development Board",
.isSmiExternalPp = MV_FALSE,
- .isSdMmcConnected = MV_TRUE
+ .isSdMmcConnected = MV_TRUE,
+ .isCm3 = MV_TRUE
};
/**********************************************************************************/
@@ -718,7 +719,8 @@
.nandFlashControl = RD_DX_BC2_BOARD_NAND_CONTROL,
.modelName = "BobCat2 Reference Design Board",
.isSmiExternalPp = MV_FALSE,
- .isSdMmcConnected = MV_TRUE
+ .isSdMmcConnected = MV_TRUE,
+ .isCm3 = MV_TRUE
};
/**********************************************************************************/
@@ -809,7 +811,8 @@
.nandFlashControl = RD_MTL_BC2_BOARD_NAND_CONTROL,
.modelName = "BobCat2 Reference Design Board",
.isSmiExternalPp = MV_FALSE,
- .isSdMmcConnected = MV_TRUE
+ .isSdMmcConnected = MV_TRUE,
+ .isCm3 = MV_TRUE
};
/*********************************************************************************/
@@ -926,7 +929,8 @@
.isSmiExternalPp = MV_TRUE,
.smiExternalPpIndex = 0,
.modelName = "BobK Cetus Development Board",
- .isSdMmcConnected = MV_TRUE
+ .isSdMmcConnected = MV_TRUE,
+ .isCm3 = MV_TRUE,
};
/*********************************************************************************/
@@ -1036,7 +1040,8 @@
.isSmiExternalPp = MV_TRUE,
.smiExternalPpIndex = 1,
.modelName = "BobK Caelum Development Board",
- .isSdMmcConnected = MV_TRUE
+ .isSdMmcConnected = MV_TRUE,
+ .isCm3 = MV_TRUE
};
/*********************************************************************************/
@@ -1147,7 +1152,7 @@
.norFlashWriteParams = DB_DX_AC3_BOARD_NOR_WRITE_PARAMS,
.modelName = "AlleyCat3 Development Board",
- .isSmiExternalPp = MV_FALSE,
+ .isSmiExternalPp = MV_FALSE
};
/*********************************************************************************/
@@ -1209,7 +1214,7 @@
.norFlashWriteParams = DB_DX_AC3_BOARD_NOR_WRITE_PARAMS,
.modelName = "AlleyCat3 Reference Design Board",
- .isSmiExternalPp = MV_FALSE,
+ .isSmiExternalPp = MV_FALSE
};
/*********************************************************************************/
/***********************************/
@@ -1270,7 +1275,7 @@
.norFlashWriteParams = DB_DX_AC3_BOARD_NOR_WRITE_PARAMS,
.modelName = "AlleyCat3 Reference Design Board",
- .isSmiExternalPp = MV_FALSE,
+ .isSmiExternalPp = MV_FALSE
};
/*********************************************************************************/
@@ -1332,7 +1337,7 @@
.norFlashWriteParams = DB_DX_AC3_BOARD_NOR_WRITE_PARAMS,
.modelName = "AlleyCat3 Reference Design Board",
- .isSmiExternalPp = MV_FALSE,
+ .isSmiExternalPp = MV_FALSE
};
/*********************************************************************************/
@@ -1394,7 +1399,7 @@
.norFlashWriteParams = DB_DX_AC3_BOARD_NOR_WRITE_PARAMS,
.modelName = "AlleyCat3 Reference Design Board",
- .isSmiExternalPp = MV_FALSE,
+ .isSmiExternalPp = MV_FALSE
};
/***************************************************************************************/
