Platforms/Marvell: Enable ComPhy Lib for Armada70x0 platform
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jan Dabros <jsd@semihalf.com>
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
diff --git a/Platforms/Marvell/Armada/Armada.dsc.inc b/Platforms/Marvell/Armada/Armada.dsc.inc
index 0e234ef..25e2763 100644
--- a/Platforms/Marvell/Armada/Armada.dsc.inc
+++ b/Platforms/Marvell/Armada/Armada.dsc.inc
@@ -31,6 +31,7 @@
#
[LibraryClasses.common]
ArmPlatformLib|OpenPlatformPkg/Platforms/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.inf
+ ComPhyLib|OpenPlatformPkg/Platforms/Marvell/Library/ComPhyLib/ComPhyLib.inf
MppLib|OpenPlatformPkg/Platforms/Marvell/Library/MppLib/MppLib.inf
ParsePcdLib|OpenPlatformPkg/Platforms/Marvell/Library/ParsePcdLib/ParsePcdLib.inf
diff --git a/Platforms/Marvell/Armada/Armada70x0.dsc b/Platforms/Marvell/Armada/Armada70x0.dsc
index 29ddf7a..347fb71 100644
--- a/Platforms/Marvell/Armada/Armada70x0.dsc
+++ b/Platforms/Marvell/Armada/Armada70x0.dsc
@@ -95,3 +95,15 @@
gMarvellTokenSpaceGuid.PcdSpiFlashEraseSize|65536
gMarvellTokenSpaceGuid.PcdSpiFlashPageSize|256
gMarvellTokenSpaceGuid.PcdSpiFlashId|0x20BA18
+
+ #ComPhy
+ gMarvellTokenSpaceGuid.PcdComPhyChipCount|1
+
+ gMarvellTokenSpaceGuid.PcdChip0ComPhyMaxLanes|6
+ gMarvellTokenSpaceGuid.PcdChip0ComPhyBaseAddress|0xF2441000
+ gMarvellTokenSpaceGuid.PcdChip0Hpipe3BaseAddress|0xF2120000
+ gMarvellTokenSpaceGuid.PcdChip0ComPhyMuxBitCount|4
+ gMarvellTokenSpaceGuid.PcdChip0Compatible|L"Cp110"
+
+ gMarvellTokenSpaceGuid.PcdChip0ComPhyTypes|L"SGMII2;USB3_HOST0;SGMII0;SATA1;USB3_HOST1;PCIE2"
+ gMarvellTokenSpaceGuid.PcdChip0ComPhySpeeds|L"3125;5000;1250;5000;5000;5000"
diff --git a/Platforms/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.c b/Platforms/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.c
index a2b25e1..e9fe92c 100644
--- a/Platforms/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.c
+++ b/Platforms/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.c
@@ -16,6 +16,7 @@
#include <Library/ArmLib.h>
#include <Library/ArmPlatformLib.h>
#include <Library/MppLib.h>
+#include <Library/MvComPhyLib.h>
#include <Ppi/ArmMpCoreInfo.h>
@@ -92,8 +93,7 @@
return RETURN_SUCCESS;
}
- //TODO: Add basic platfrom initialization
-
+ MvComPhyInit ();
MppInitialize ();
return RETURN_SUCCESS;
}
diff --git a/Platforms/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.inf b/Platforms/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.inf
index bd78406..367d1ce 100644
--- a/Platforms/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.inf
+++ b/Platforms/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.inf
@@ -47,6 +47,7 @@
[LibraryClasses]
ArmLib
+ ComPhyLib
DebugLib
MemoryAllocationLib
MppLib
