diff --git a/rocclr/runtime/device/pal/paldefs.hpp b/rocclr/runtime/device/pal/paldefs.hpp
index 9e38daada4..ab74566de9 100644
--- a/rocclr/runtime/device/pal/paldefs.hpp
+++ b/rocclr/runtime/device/pal/paldefs.hpp
@@ -132,10 +132,16 @@ static const AMDDeviceInfo DeviceInfo[] = {
 
 /* Bonaire */   { "Bonaire",    "bonaire",  4, 16, 1, 256, 64 * Ki, 32, 700 },
 /* Hawaii */    { "Hawaii",     "hawaii",   4, 16, 1, 256, 64 * Ki, 32, 701 },
+/* Hawaii */    { "",           "grenada",  4, 16, 1, 256, 64 * Ki, 32, 701 },
+/* Hawaii */    { "",           "maui",     4, 16, 1, 256, 64 * Ki, 32, 701 },
+
 /* Kalindi */   { "Kalindi",    "kalindi",  4, 16, 1, 256, 64 * Ki, 32, 702 },
+/* Godavari */  { "Mullins",    "mullins",  4, 16, 1, 256, 64 * Ki, 32, 702 },
 /* Spectre */   { "Spectre",    "spectre",  4, 16, 1, 256, 64 * Ki, 32, 701 },
+/* Spooky */    { "Spooky",     "spooky",   4, 16, 1, 256, 64 * Ki, 32, 701 },
 
 /* Carrizo */   { "Carrizo" ,   "carrizo",  4, 16, 1, 256, 64 * Ki, 32, 801 },
+/* Bristol */   { "Bristol Ridge" ,  "carrizo",  4, 16, 1, 256, 64 * Ki, 32, 801 },
 /* Stoney */    { "Stoney",     "stoney",   4, 16, 1, 256, 64 * Ki, 32, 810 },
 
 /* Iceland */   { "Iceland",    "iceland",  4, 16, 1, 256, 64 * Ki, 32, 800 },
diff --git a/rocclr/runtime/device/pal/paldevice.cpp b/rocclr/runtime/device/pal/paldevice.cpp
index 414552534c..d4d65a5480 100644
--- a/rocclr/runtime/device/pal/paldevice.cpp
+++ b/rocclr/runtime/device/pal/paldevice.cpp
@@ -700,7 +700,7 @@ Device::create(Pal::IDevice* device)
     asicRevision_ = properties().revision;
 
     // Update HW info for the device
-    if ((GPU_ENABLE_PAL == 1) && (properties().revision != Pal::AsicRevision::Unknown)) {
+    if ((GPU_ENABLE_PAL == 1) && (properties().revision <= Pal::AsicRevision::Baffin)) {
         hwInfo_ = &DeviceInfo[static_cast<uint>(properties().revision)];
     }
     else if (ipLevel_ >= Pal::GfxIpLevel::GfxIp9) {
diff --git a/rocclr/runtime/device/pal/palsettings.cpp b/rocclr/runtime/device/pal/palsettings.cpp
index 0be808b97d..5ef4e6f4bb 100644
--- a/rocclr/runtime/device/pal/palsettings.cpp
+++ b/rocclr/runtime/device/pal/palsettings.cpp
@@ -179,8 +179,12 @@ Settings::create(
             assert(0 && "Unknown GfxIP type!");
             return false;
         }
+    case Pal::AsicRevision::Vega10:
+    case Pal::AsicRevision::Raven:
+        aiPlus_ = true;
         // Fall through to VI ...
     case Pal::AsicRevision::Carrizo:
+    case Pal::AsicRevision::Bristol:
     case Pal::AsicRevision::Stoney:
         if (!aiPlus_) {
             // Fix BSOD/TDR issues observed on Stoney Win7/8.1/10
@@ -207,7 +211,9 @@ Settings::create(
         enableExtension(ClKhrFp16);
         // Fall through to CI ...
     case Pal::AsicRevision::Kalindi:
+    case Pal::AsicRevision::Godavari:
     case Pal::AsicRevision::Spectre:
+    case Pal::AsicRevision::Spooky:
         if (!viPlus_) {
             // Fix BSOD/TDR issues observed on Kaveri Win7 (EPR#416903)
             modifyMaxWorkload.time = 250000;      // 250ms