Platforms/Marvell: Enable UtmiPhyLib for Armada70x0 Platforms
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 47934b2..490799b 100644
--- a/Platforms/Marvell/Armada/Armada.dsc.inc
+++ b/Platforms/Marvell/Armada/Armada.dsc.inc
@@ -34,6 +34,7 @@
ComPhyLib|OpenPlatformPkg/Platforms/Marvell/Library/ComPhyLib/ComPhyLib.inf
MppLib|OpenPlatformPkg/Platforms/Marvell/Library/MppLib/MppLib.inf
ParsePcdLib|OpenPlatformPkg/Platforms/Marvell/Library/ParsePcdLib/ParsePcdLib.inf
+ UtmiPhyLib|OpenPlatformPkg/Platforms/Marvell/Library/UtmiPhyLib/UtmiPhyLib.inf
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf
diff --git a/Platforms/Marvell/Armada/Armada70x0.dsc b/Platforms/Marvell/Armada/Armada70x0.dsc
index 3062591..4f08e88 100644
--- a/Platforms/Marvell/Armada/Armada70x0.dsc
+++ b/Platforms/Marvell/Armada/Armada70x0.dsc
@@ -105,6 +105,13 @@
gMarvellTokenSpaceGuid.PcdChip0ComPhyMuxBitCount|4
gMarvellTokenSpaceGuid.PcdChip0Compatible|L"Cp110"
+ #UtmiPhy
+ gMarvellTokenSpaceGuid.PcdUtmiPhyCount|2
+ gMarvellTokenSpaceGuid.PcdUtmiPhyRegUsbCfg|L"0xF2440420;0xF2440420"
+ gMarvellTokenSpaceGuid.PcdUtmiPhyRegUtmiCfg|L"0xF2440440;0xF2440444"
+ gMarvellTokenSpaceGuid.PcdUtmiPhyRegUtmiUnit|L"0xF2580000;0xF2581000"
+ gMarvellTokenSpaceGuid.PcdUtmiPhyUtmiPort|L"0x0;0x1"
+
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 e9fe92c..0ed310f 100644
--- a/Platforms/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.c
+++ b/Platforms/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.c
@@ -17,6 +17,7 @@
#include <Library/ArmPlatformLib.h>
#include <Library/MppLib.h>
#include <Library/MvComPhyLib.h>
+#include <Library/UtmiPhyLib.h>
#include <Ppi/ArmMpCoreInfo.h>
@@ -94,6 +95,7 @@
}
MvComPhyInit ();
+ UtmiPhyInit ();
MppInitialize ();
return RETURN_SUCCESS;
}
diff --git a/Platforms/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.inf b/Platforms/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.inf
index 367d1ce..23b17f0 100644
--- a/Platforms/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.inf
+++ b/Platforms/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.inf
@@ -51,6 +51,7 @@
DebugLib
MemoryAllocationLib
MppLib
+ UtmiPhyLib
[Sources.common]
Armada70x0Lib.c
