ArmVirtPkg/FdtClientDxe: report address and size cell count directly

[mirror_edk2.git] / ArmVirtPkg / Library / ArmVirtGicArchLib / ArmVirtGicArchLib.c

diff --git a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c
index a1cd2da2d43a29e18b8c1fa33cd7a1f0bb0f679e..64afc4de6b4d75de43e42470ad2572cae1c35478 100644 (file)
--- a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c
+++ b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c
@@ -36,7 +36,8 @@ ArmVirtGicArchLibConstructor (
   UINT32                IccSre;\r
   FDT_CLIENT_PROTOCOL   *FdtClient;\r
   CONST UINT64          *Reg;\r
-  UINT32                RegElemSize, RegSize;\r
+  UINT32                RegSize;\r
+  UINTN                 AddressCells, SizeCells;\r
   UINTN                 GicRevision;\r
   EFI_STATUS            Status;\r
   UINT64                DistBase, CpuBase, RedistBase;\r
@@ -47,11 +48,13 @@ ArmVirtGicArchLibConstructor (
 \r
   GicRevision = 2;\r
   Status = FdtClient->FindCompatibleNodeReg (FdtClient, "arm,cortex-a15-gic",\r
-                        (CONST VOID **)&Reg, &RegElemSize, &RegSize);\r
+                        (CONST VOID **)&Reg, &AddressCells, &SizeCells,\r
+                        &RegSize);\r
   if (Status == EFI_NOT_FOUND) {\r
     GicRevision = 3;\r
     Status = FdtClient->FindCompatibleNodeReg (FdtClient, "arm,gic-v3",\r
-                          (CONST VOID **)&Reg, &RegElemSize, &RegSize);\r
+                          (CONST VOID **)&Reg, &AddressCells, &SizeCells,\r
+                          &RegSize);\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r