Merge tag 2.4.1 from upstream Horizon-OC

Source/hoc-clk/overlay/src/ui/gui/config_info_strings.cpp

@@ -479,7 +479,7 @@ std::vector<std::string> ConfigInfoStrings(HocClkConfigValue val, bool isMariko,
                 " - HiOPT: L4T Custom HiOPT table, HOC Default",
                 " - HiOPT - 15mV: L4T Custom HiOPT table with a 15mV offset",
                 " - High UV: The highest undervolt table",
-                "Default: No Undervolt"
+                "Default: HiOPT"
             };
 
         case KipConfigValue_marikoGpuVmin:

Source/hoc-clk/sysmodule/src/board/board_fuse.cpp

@@ -26,26 +26,22 @@
 namespace board {
 
     void SetGpuBracket(u16 speedo, u8 &gpuBracket) {
-        if (GetSocType() == HocClkSocType_Mariko) {
-            if (speedo <= 1624) {
-                gpuBracket = 0;
-                return;
-            }
-
-            if (speedo <= 1689) {
-                gpuBracket = 1;
-                return;
-            }
-
-            if (speedo <= 1753) {
-                gpuBracket = 2;
-                return;
-            }
-
-            /* >= 1754 */
-            gpuBracket = 3;
-        } else {
         switch (speedo) {
+            // Mariko
+            case 1300 ... 1624:
+                gpuBracket = 0;
+                break;
+            case 1625 ... 1689:
+                gpuBracket = 1;
+                break;
+            case 1690 ... 1753:
+                gpuBracket = 2;
+                break;
+            case 1754 ... 1849:
+                gpuBracket = 3;
+                break;
+
+            // Erista
             case 1850 ... 1925:
                 gpuBracket = 0;
                 break;
@@ -63,7 +59,6 @@ namespace board {
                 break;
         }
     }
-    }
 
     void ReadFuses(FuseData &speedo, u64 fuseVa) {
         constexpr u32 FuseOffset = 0x800;

Source/hoc-clk/sysmodule/src/board/board_volt.cpp

@@ -449,6 +449,7 @@ namespace board {
                     break;
                 }
             }
+            return baseVolt;
         } else {
             struct DvfsEntry {
                 u32 freq;
@@ -546,8 +547,7 @@ namespace board {
                     break;
                 }
             }
-        }
-
             return baseVolt;
         }
+    }
 }  // namespace board