2 files changed, 8 insertions, 8 deletions
diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c
index d02fc4929d..d00eaafe60 100644
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c
@@ -1,11 +1,11 @@
 /** @file
   GTDT table parser
 
-  Copyright (c) 2016 - 2020, ARM Limited. All rights reserved.
+  Copyright (c) 2016 - 2021, ARM Limited. All rights reserved.
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
   @par Reference(s):
-    - ACPI 6.3 Specification - January 2019
+    - ACPI 6.4 Specification - January 2021
   **/
 
 #include <IndustryStandard/Acpi.h>
@@ -155,7 +155,7 @@ STATIC CONST ACPI_PARSER GtBlockTimerParser[] = {
 /**
   An ACPI_PARSER array describing the Platform Watchdog.
 **/
-STATIC CONST ACPI_PARSER SBSAGenericWatchdogParser[] = {
+STATIC CONST ACPI_PARSER ArmGenericWatchdogParser[] = {
   {L"Type", 1, 0, L"%d", NULL, NULL, NULL, NULL},
   {L"Length", 2, 1, L"%d", NULL, NULL, NULL, NULL},
   {L"Reserved", 1, 3, L"%x", NULL, NULL, NULL, NULL},
@@ -236,10 +236,10 @@ DumpWatchdogTimer (
   ParseAcpi (
     TRUE,
     2,
-    "SBSA Generic Watchdog",
+    "Arm Generic Watchdog",
     Ptr,
     Length,
-    PARSER_PARAMS (SBSAGenericWatchdogParser)
+    PARSER_PARAMS (ArmGenericWatchdogParser)
     );
 }
 
@@ -343,10 +343,10 @@ ParseAcpiGtdt (
     }
 
     switch (*PlatformTimerType) {
-      case EFI_ACPI_6_3_GTDT_GT_BLOCK:
+      case EFI_ACPI_6_4_GTDT_GT_BLOCK:
         DumpGTBlock (TimerPtr, *PlatformTimerLength);
         break;
-      case EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG:
+      case EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG:
         DumpWatchdogTimer (TimerPtr, *PlatformTimerLength);
         break;
       default:
diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c
index b30ed3fc85..dcc98f1f13 100644
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c
@@ -54,7 +54,7 @@ ACPI_TABLE_PARSER ParserList[] = {
    ParseAcpiDsdt},
   {EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE, ParseAcpiFacs},
   {EFI_ACPI_6_2_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiFadt},
-  {EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiGtdt},
+  {EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiGtdt},
   {EFI_ACPI_6_3_HETEROGENEOUS_MEMORY_ATTRIBUTE_TABLE_SIGNATURE, ParseAcpiHmat},
   {EFI_ACPI_6_2_IO_REMAPPING_TABLE_SIGNATURE, ParseAcpiIort},
   {EFI_ACPI_6_2_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiMadt},