diff --git a/Makefile b/Makefile
index ce5b00d..4bffe9a 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ ifneq ($(OS),Windows_NT)
 	else
 		SRC_DIR=src/arm/
 		SOURCE += $(COMMON_SRC) $(SRC_DIR)midr.c $(SRC_DIR)uarch.c $(SRC_DIR)soc.c $(SRC_DIR)udev.c
-		HEADERS += $(COMMON_HDR) $(SRC_DIR)midr.h $(SRC_DIR)uarch.h  $(SRC_DIR)soc.h $(SRC_DIR)udev.c
+		HEADERS += $(COMMON_HDR) $(SRC_DIR)midr.h $(SRC_DIR)uarch.h  $(SRC_DIR)soc.h $(SRC_DIR)udev.c $(SRC_DIR)socs.h
 		CXXFLAGS += -DARCH_ARM -Wno-unused-parameter
 	endif
 		
diff --git a/src/arm/soc.c b/src/arm/soc.c
index d0526e4..2bf4827 100644
--- a/src/arm/soc.c
+++ b/src/arm/soc.c
@@ -4,6 +4,7 @@
 #include <ctype.h>
 
 #include "soc.h"
+#include "socs.h"
 #include "udev.h"
 #include "../common/global.h"
 
@@ -11,15 +12,16 @@
 #define STRING_UNKNOWN    "Unknown"
 
 static char* soc_trademark_string[] = {
-  [SOC_SNAPDRAGON] = "Snapdragon ",
-  [SOC_MEDIATEK]   = "MediaTek ",
-  [SOC_EXYNOS]     = "Exynos ",
-  [SOC_KIRIN]      = "Kirin ",
-  [SOC_BROADCOM]   = "Broadcom BCM",
+  [SOC_VENDOR_SNAPDRAGON] = "Snapdragon ",
+  [SOC_VENDOR_MEDIATEK]   = "MediaTek ",
+  [SOC_VENDOR_EXYNOS]     = "Exynos ",
+  [SOC_VENDOR_KIRIN]      = "Kirin ",
+  [SOC_VENDOR_BROADCOM]   = "Broadcom BCM",
 };
 
-void fill_soc(struct system_on_chip* soc, char* soc_name, VENDOR soc_vendor, int32_t process) {
-  soc->soc_vendor = soc_vendor;
+void fill_soc(struct system_on_chip* soc, char* soc_name, SOC soc_model, int32_t process) {
+  soc->soc_model = soc_model;
+  soc->soc_vendor = get_soc_vendor_from_soc(soc_model);
   soc->process = process;
   int len = strlen(soc_name) + strlen(soc_trademark_string[soc->soc_vendor]) + 1;
   soc->soc_name = malloc(sizeof(char) * len);
@@ -27,7 +29,7 @@ void fill_soc(struct system_on_chip* soc, char* soc_name, VENDOR soc_vendor, int
   sprintf(soc->soc_name, "%s%s", soc_trademark_string[soc->soc_vendor], soc_name);    
 }
 
-bool match_soc(struct system_on_chip* soc, char* raw_name, char* expected_name, char* soc_name, VENDOR soc_vendor, int32_t process) {
+bool match_soc(struct system_on_chip* soc, char* raw_name, char* expected_name, char* soc_name, SOC soc_model, int32_t process) {
   if(strlen(raw_name) > strlen(expected_name))
     return false;
   
@@ -36,7 +38,7 @@ bool match_soc(struct system_on_chip* soc, char* raw_name, char* expected_name,
     return false;
   }
   else {
-    fill_soc(soc, soc_name, soc_vendor, process);
+    fill_soc(soc, soc_name, soc_model, process);
     return true;    
   }
 }
@@ -54,8 +56,8 @@ char* toupperstr(char* str) {
 }
 
 #define SOC_START if (false) {}
-#define CHECK_SOC(raw_name, expected_name, soc_name, soc_vendor, soc, process) \
-   else if (match_soc(soc, raw_name, expected_name, soc_name, soc_vendor, process)) return true;
+#define CHECK_SOC(raw_name, expected_name, soc_name, soc_model, soc, process) \
+   else if (match_soc(soc, raw_name, expected_name, soc_name, soc_model, process)) return true;
 #define SOC_END else { return false; }
 
 // https://en.wikipedia.org/wiki/Raspberry_Pi
@@ -68,20 +70,20 @@ bool match_broadcom(char* soc_name, struct system_on_chip* soc) {
     return false;
   
   SOC_START
-  CHECK_SOC(tmp, "BCM2835",              "2835",              SOC_BROADCOM, soc, 65)    
-  CHECK_SOC(tmp, "BCM2836",              "2836",              SOC_BROADCOM, soc, 40)    
-  CHECK_SOC(tmp, "BCM2837",              "2837",              SOC_BROADCOM, soc, 40) 
-  CHECK_SOC(tmp, "BCM2837B0",            "2837B0",            SOC_BROADCOM, soc, 40) 
-  CHECK_SOC(tmp, "BCM2711",              "2711",              SOC_BROADCOM, soc, 28)  
-  CHECK_SOC(tmp, "BCM21553",             "21553",             SOC_BROADCOM, soc, 65)    
-  CHECK_SOC(tmp, "BCM21553-Thunderbird", "21553 Thunderbird", SOC_BROADCOM, soc, 65)      
-  CHECK_SOC(tmp, "BCM21663",             "21663",             SOC_BROADCOM, soc, 40) 
-  CHECK_SOC(tmp, "BCM21664",             "21664",             SOC_BROADCOM, soc, 40) 
-  CHECK_SOC(tmp, "BCM28155",             "28155",             SOC_BROADCOM, soc, 40) 
-  CHECK_SOC(tmp, "BCM23550",             "23550",             SOC_BROADCOM, soc, 40) 
-  CHECK_SOC(tmp, "BCM28145",             "28145",             SOC_BROADCOM, soc, 40) 
-  CHECK_SOC(tmp, "BCM2157",              "2157",              SOC_BROADCOM, soc, 65) 
-  CHECK_SOC(tmp, "BCM21654",             "21654",             SOC_BROADCOM, soc, 40) 
+  CHECK_SOC(tmp, "BCM2835",              "2835",              SOC_BCM_2835,   soc, 65)    
+  CHECK_SOC(tmp, "BCM2836",              "2836",              SOC_BCM_2836,   soc, 40)    
+  CHECK_SOC(tmp, "BCM2837",              "2837",              SOC_BCM_2837,   soc, 40) 
+  CHECK_SOC(tmp, "BCM2837B0",            "2837B0",            SOC_BCM_2837B0, soc, 40) 
+  CHECK_SOC(tmp, "BCM2711",              "2711",              SOC_BCM_2711,   soc, 28)  
+  CHECK_SOC(tmp, "BCM21553",             "21553",             SOC_BCM_21553,  soc, 65)    
+  CHECK_SOC(tmp, "BCM21553-Thunderbird", "21553 Thunderbird", SOC_BCM_21553T, soc, 65)      
+  CHECK_SOC(tmp, "BCM21663",             "21663",             SOC_BCM_21663,  soc, 40) 
+  CHECK_SOC(tmp, "BCM21664",             "21664",             SOC_BCM_21664,  soc, 40) 
+  CHECK_SOC(tmp, "BCM28155",             "28155",             SOC_BCM_28155,  soc, 40) 
+  CHECK_SOC(tmp, "BCM23550",             "23550",             SOC_BCM_23550,  soc, 40) 
+  CHECK_SOC(tmp, "BCM28145",             "28145",             SOC_BCM_28145,  soc, 40) 
+  CHECK_SOC(tmp, "BCM2157",              "2157",              SOC_BCM_2157,   soc, 65) 
+  CHECK_SOC(tmp, "BCM21654",             "21654",             SOC_BCM_21654,  soc, 40) 
   SOC_END
 }
 
@@ -94,34 +96,34 @@ bool match_hisilicon(char* soc_name, struct system_on_chip* soc) {
     return false;
   
   SOC_START
-  CHECK_SOC(tmp, "Hi3620GFC",  "K3V2",  SOC_KIRIN, soc, 40)
-  //CHECK_SOC(tmp, "?",          "K3V2E", SOC_KIRIN, soc,  ?)
-  //CHECK_SOC(tmp, "?",          "620",   SOC_KIRIN, soc, 28)
-  //CHECK_SOC(tmp, "?",          "650",   SOC_KIRIN, soc, 16)
-  //CHECK_SOC(tmp, "?",          "655",   SOC_KIRIN, soc, 16)
-  //CHECK_SOC(tmp, "?",          "658",   SOC_KIRIN, soc, 16)
-  //CHECK_SOC(tmp, "?",          "659",   SOC_KIRIN, soc, 16)
-  //CHECK_SOC(tmp, "?",          "710",   SOC_KIRIN, soc, 12)
-  //CHECK_SOC(tmp, "?",          "710A",  SOC_KIRIN, soc, 12)
-  //CHECK_SOC(tmp, "?",          "710F",  SOC_KIRIN, soc, 12)
-  //CHECK_SOC(tmp, "?",          "810",   SOC_KIRIN, soc,  7)
-  //CHECK_SOC(tmp, "?",          "820",   SOC_KIRIN, soc,  7)
-  //CHECK_SOC(tmp, "?",          "9000",  SOC_KIRIN, soc,  5)
-  //CHECK_SOC(tmp, "?",          "9000E", SOC_KIRIN, soc,  5)
-  //CHECK_SOC(tmp, "?",          "910",   SOC_KIRIN, soc, 28)
-  //CHECK_SOC(tmp, "?",          "910T",  SOC_KIRIN, soc, 28)
-  CHECK_SOC(tmp, "Hi3630",     "920",   SOC_KIRIN, soc, 28)
-  //CHECK_SOC(tmp, "?",          "925",   SOC_KIRIN, soc, 28)
-  //CHECK_SOC(tmp, "?",          "930",   SOC_KIRIN, soc, ?)
-  //CHECK_SOC(tmp, "?",          "935",   SOC_KIRIN, soc, ?)
-  CHECK_SOC(tmp, "Hi3650",     "950",   SOC_KIRIN, soc, 16)
-  //CHECK_SOC(tmp, "?",          "955",   SOC_KIRIN, soc, ?)
-  CHECK_SOC(tmp, "Hi3660",     "960",   SOC_KIRIN, soc, 16)
-  //CHECK_SOC(tmp, "?",          "960S",  SOC_KIRIN, soc, 16)
-  CHECK_SOC(tmp, "Hi3670",     "970",   SOC_KIRIN, soc, 10)
-  CHECK_SOC(tmp, "Hi3680",     "980",   SOC_KIRIN, soc,  7)
-  //CHECK_SOC(tmp, "?",          "985",   SOC_KIRIN, soc,  7)
-  CHECK_SOC(tmp, "Hi3690",     "990",   SOC_KIRIN, soc,  7)
+  CHECK_SOC(tmp, "Hi3620GFC",  "K3V2",  SOC_HISILICON_3620, soc, 40)
+  //CHECK_SOC(tmp, "?",        "K3V2E", SOC_KIRIN, soc,  ?)
+  //CHECK_SOC(tmp, "?",        "620",   SOC_KIRIN, soc, 28)
+  //CHECK_SOC(tmp, "?",        "650",   SOC_KIRIN, soc, 16)
+  //CHECK_SOC(tmp, "?",        "655",   SOC_KIRIN, soc, 16)
+  //CHECK_SOC(tmp, "?",        "658",   SOC_KIRIN, soc, 16)
+  //CHECK_SOC(tmp, "?",        "659",   SOC_KIRIN, soc, 16)
+  //CHECK_SOC(tmp, "?",        "710",   SOC_KIRIN, soc, 12)
+  //CHECK_SOC(tmp, "?",        "710A",  SOC_KIRIN, soc, 12)
+  //CHECK_SOC(tmp, "?",        "710F",  SOC_KIRIN, soc, 12)
+  //CHECK_SOC(tmp, "?",        "810",   SOC_KIRIN, soc,  7)
+  //CHECK_SOC(tmp, "?",        "820",   SOC_KIRIN, soc,  7)
+  //CHECK_SOC(tmp, "?",        "9000",  SOC_KIRIN, soc,  5)
+  //CHECK_SOC(tmp, "?",        "9000E", SOC_KIRIN, soc,  5)
+  //CHECK_SOC(tmp, "?",        "910",   SOC_KIRIN, soc, 28)
+  //CHECK_SOC(tmp, "?",        "910T",  SOC_KIRIN, soc, 28)
+  CHECK_SOC(tmp, "Hi3630",     "920",   SOC_HISILICON_3630, soc, 28)
+  //CHECK_SOC(tmp, "?",        "925",   SOC_KIRIN, soc, 28)
+  //CHECK_SOC(tmp, "?",        "930",   SOC_KIRIN, soc, ?)
+  //CHECK_SOC(tmp, "?",        "935",   SOC_KIRIN, soc, ?)
+  CHECK_SOC(tmp, "Hi3650",     "950",   SOC_HISILICON_3650, soc, 16)
+  //CHECK_SOC(tmp, "?",        "955",   SOC_KIRIN, soc, ?)
+  CHECK_SOC(tmp, "Hi3660",     "960",   SOC_HISILICON_3660, soc, 16)
+  //CHECK_SOC(tmp, "?",        "960S",  SOC_KIRIN, soc, 16)
+  CHECK_SOC(tmp, "Hi3670",     "970",   SOC_HISILICON_3670, soc, 10)
+  CHECK_SOC(tmp, "Hi3680",     "980",   SOC_HISILICON_3680, soc,  7)
+  //CHECK_SOC(tmp, "?",        "985",   SOC_KIRIN, soc,  7)
+  CHECK_SOC(tmp, "Hi3690",     "990",   SOC_HISILICON_3690, soc,  7)
   SOC_END
 }
 
@@ -133,40 +135,40 @@ bool match_exynos(char* soc_name, struct system_on_chip* soc) {
   
   SOC_START
   // universalXXXX //
-  CHECK_SOC(tmp, "universal3475", "3475", SOC_EXYNOS, soc, 28) 
-  CHECK_SOC(tmp, "universal4210", "4210", SOC_EXYNOS, soc, 45)
-  CHECK_SOC(tmp, "universal4212", "4212", SOC_EXYNOS, soc, 32)
-  CHECK_SOC(tmp, "universal4412", "4412", SOC_EXYNOS, soc, 32)
-  CHECK_SOC(tmp, "universal5250", "5250", SOC_EXYNOS, soc, 32)
-  CHECK_SOC(tmp, "universal5410", "5410", SOC_EXYNOS, soc, 28)
-  CHECK_SOC(tmp, "universal5420", "5420", SOC_EXYNOS, soc, 28)
-  CHECK_SOC(tmp, "universal5422", "5422", SOC_EXYNOS, soc, 28)
-  CHECK_SOC(tmp, "universal5430", "5430", SOC_EXYNOS, soc, 20)
-  CHECK_SOC(tmp, "universal5433", "5433", SOC_EXYNOS, soc, 20)
-  CHECK_SOC(tmp, "universal5260", "5260", SOC_EXYNOS, soc, 28)
-  CHECK_SOC(tmp, "universal7270", "7270", SOC_EXYNOS, soc, 14)
-  CHECK_SOC(tmp, "universal7420", "7420", SOC_EXYNOS, soc, 14)
-  CHECK_SOC(tmp, "universal7570", "7570", SOC_EXYNOS, soc, 14)
-  CHECK_SOC(tmp, "universal7870", "7870", SOC_EXYNOS, soc, 14)
-  CHECK_SOC(tmp, "universal7872", "7872", SOC_EXYNOS, soc, 14)
-  CHECK_SOC(tmp, "universal7880", "7880", SOC_EXYNOS, soc, 14)
-  CHECK_SOC(tmp, "universal7884", "7884", SOC_EXYNOS, soc, 14)
-  CHECK_SOC(tmp, "universal7885", "7885", SOC_EXYNOS, soc, 14)
-  CHECK_SOC(tmp, "universal7904", "7904", SOC_EXYNOS, soc, 14)
-  CHECK_SOC(tmp, "universal8890", "8890", SOC_EXYNOS, soc, 14)
-  CHECK_SOC(tmp, "universal8895", "8895", SOC_EXYNOS, soc, 10)
-  CHECK_SOC(tmp, "universal9110", "9110", SOC_EXYNOS, soc, 14)
-  CHECK_SOC(tmp, "universal9609", "9609", SOC_EXYNOS, soc, 10)
-  CHECK_SOC(tmp, "universal9610", "9610", SOC_EXYNOS, soc, 10)
-  CHECK_SOC(tmp, "universal9611", "9611", SOC_EXYNOS, soc, 10)
-  CHECK_SOC(tmp, "universal9810", "9810", SOC_EXYNOS, soc, 10)
-  CHECK_SOC(tmp, "universal9820", "9820", SOC_EXYNOS, soc,  8)
-  CHECK_SOC(tmp, "universal9825", "9825", SOC_EXYNOS, soc,  7)
+  CHECK_SOC(tmp, "universal3475", "3475", SOC_EXYNOS_3475, soc, 28) 
+  CHECK_SOC(tmp, "universal4210", "4210", SOC_EXYNOS_4210, soc, 45)
+  CHECK_SOC(tmp, "universal4212", "4212", SOC_EXYNOS_4212, soc, 32)
+  CHECK_SOC(tmp, "universal4412", "4412", SOC_EXYNOS_4412, soc, 32)
+  CHECK_SOC(tmp, "universal5250", "5250", SOC_EXYNOS_5250, soc, 32)
+  CHECK_SOC(tmp, "universal5410", "5410", SOC_EXYNOS_5410, soc, 28)
+  CHECK_SOC(tmp, "universal5420", "5420", SOC_EXYNOS_5420, soc, 28)
+  CHECK_SOC(tmp, "universal5422", "5422", SOC_EXYNOS_5422, soc, 28)
+  CHECK_SOC(tmp, "universal5430", "5430", SOC_EXYNOS_5430, soc, 20)
+  CHECK_SOC(tmp, "universal5433", "5433", SOC_EXYNOS_5433, soc, 20)
+  CHECK_SOC(tmp, "universal5260", "5260", SOC_EXYNOS_5260, soc, 28)
+  CHECK_SOC(tmp, "universal7270", "7270", SOC_EXYNOS_7270, soc, 14)
+  CHECK_SOC(tmp, "universal7420", "7420", SOC_EXYNOS_7420, soc, 14)
+  CHECK_SOC(tmp, "universal7570", "7570", SOC_EXYNOS_7570, soc, 14)
+  CHECK_SOC(tmp, "universal7870", "7870", SOC_EXYNOS_7870, soc, 14)
+  CHECK_SOC(tmp, "universal7872", "7872", SOC_EXYNOS_7872, soc, 14)
+  CHECK_SOC(tmp, "universal7880", "7880", SOC_EXYNOS_7880, soc, 14)
+  CHECK_SOC(tmp, "universal7884", "7884", SOC_EXYNOS_7884, soc, 14)
+  CHECK_SOC(tmp, "universal7885", "7885", SOC_EXYNOS_7885, soc, 14)
+  CHECK_SOC(tmp, "universal7904", "7904", SOC_EXYNOS_7904, soc, 14)
+  CHECK_SOC(tmp, "universal8890", "8890", SOC_EXYNOS_8890, soc, 14)
+  CHECK_SOC(tmp, "universal8895", "8895", SOC_EXYNOS_8895, soc, 10)
+  CHECK_SOC(tmp, "universal9110", "9110", SOC_EXYNOS_9110, soc, 14)
+  CHECK_SOC(tmp, "universal9609", "9609", SOC_EXYNOS_9609, soc, 10)
+  CHECK_SOC(tmp, "universal9610", "9610", SOC_EXYNOS_9610, soc, 10)
+  CHECK_SOC(tmp, "universal9611", "9611", SOC_EXYNOS_9611, soc, 10)
+  CHECK_SOC(tmp, "universal9810", "9810", SOC_EXYNOS_9810, soc, 10)
+  CHECK_SOC(tmp, "universal9820", "9820", SOC_EXYNOS_9820, soc,  8)
+  CHECK_SOC(tmp, "universal9825", "9825", SOC_EXYNOS_9825, soc,  7)
   // New exynos. Dont know if they will work //
-  CHECK_SOC(tmp, "universal1080", "1080", SOC_EXYNOS, soc,  5)  
-  CHECK_SOC(tmp, "universal990",   "990", SOC_EXYNOS, soc,  7)
-  CHECK_SOC(tmp, "universal980",   "980", SOC_EXYNOS, soc,  8)    
-  CHECK_SOC(tmp, "universal880",   "880", SOC_EXYNOS, soc,  8)
+  CHECK_SOC(tmp, "universal1080", "1080", SOC_EXYNOS_1080, soc,  5)  
+  CHECK_SOC(tmp, "universal990",   "990", SOC_EXYNOS_990,  soc,  7)
+  CHECK_SOC(tmp, "universal980",   "980", SOC_EXYNOS_980,  soc,  8)    
+  CHECK_SOC(tmp, "universal880",   "880", SOC_EXYNOS_880,  soc,  8)
   SOC_END
 }
 
@@ -178,91 +180,89 @@ bool match_mediatek(char* soc_name, struct system_on_chip* soc) {
   
   SOC_START
   // Dimensity //
-  //CHECK_SOC(tmp, "?",     "Dimensity 1000",  SOC_MEDIATEK, soc, 7) 
-  //CHECK_SOC(tmp, "?",     "Dimensity 1000L", SOC_MEDIATEK, soc, 7) 
-  //CHECK_SOC(tmp, "?",     "Dimensity 700",   SOC_MEDIATEK, soc, 7) 
-  //CHECK_SOC(tmp, "?",     "Dimensity 720",   SOC_MEDIATEK, soc, 7) 
-  CHECK_SOC(tmp, "MT6873",  "Dimensity 800",   SOC_MEDIATEK, soc, 7)
-  //CHECK_SOC(tmp, "?",     "Dimensity 820",   SOC_MEDIATEK, soc, 7)
+  //CHECK_SOC(tmp, "?",     "Dimensity 1000",  SOC_MTK_,        soc, 7) 
+  //CHECK_SOC(tmp, "?",     "Dimensity 1000L", SOC_MTK_,        soc, 7) 
+  //CHECK_SOC(tmp, "?",     "Dimensity 700",   SOC_MTK_,        soc, 7) 
+  //CHECK_SOC(tmp, "?",     "Dimensity 720",   SOC_MTK_,        soc, 7) 
+  CHECK_SOC(tmp, "MT6873",  "Dimensity 800",   SOC_MTK_MT6873,  soc, 7)
+  //CHECK_SOC(tmp, "?",     "Dimensity 820",   SOC_MTK_,        soc, 7)
   // Helio //
-  CHECK_SOC(tmp, "MT6761",  "Helio A22",       SOC_MEDIATEK, soc, 12)
-  CHECK_SOC(tmp, "MT6762D", "Helio A25",       SOC_MEDIATEK, soc, 12)
-  //CHECK_SOC(tmp, "?",     "Helio G25",       SOC_MEDIATEK, soc, 12)
-  //CHECK_SOC(tmp, "?",     "Helio G35",       SOC_MEDIATEK, soc, 12)
-  //CHECK_SOC(tmp, "?",     "Helio G70",       SOC_MEDIATEK, soc, 12)
-  //CHECK_SOC(tmp, "?",     "Helio G80",       SOC_MEDIATEK, soc, 12)
-  //CHECK_SOC(tmp, "?",     "Helio G90",       SOC_MEDIATEK, soc, 12)
-  //CHECK_SOC(tmp, "?",     "Helio G90T",      SOC_MEDIATEK, soc, 12)
-  //CHECK_SOC(tmp, "?",     "Helio G95",       SOC_MEDIATEK, soc, 12)
-  CHECK_SOC(tmp, "MT6755M", "Helio P10",       SOC_MEDIATEK, soc, 28)
-  //CHECK_SOC(tmp, "?",     "Helio P15",       SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6757",  "Helio P20",       SOC_MEDIATEK, soc, 16)
-  CHECK_SOC(tmp, "MT6762",  "Helio P22",       SOC_MEDIATEK, soc, 12)
-  CHECK_SOC(tmp, "MT6763T", "Helio P23",       SOC_MEDIATEK, soc, 16)
-  //CHECK_SOC(tmp, "?",     "Helio P25",       SOC_MEDIATEK, soc, 16)
-  //CHECK_SOC(tmp, "?",     "Helio P30",       SOC_MEDIATEK, soc, 16)
-  CHECK_SOC(tmp, "MT6765",  "Helio P35",       SOC_MEDIATEK, soc, 12)
-  //CHECK_SOC(tmp, "?",     "Helio P60",       SOC_MEDIATEK, soc, 12)
-  //CHECK_SOC(tmp, "?",     "Helio P65",       SOC_MEDIATEK, soc, 12)
-  CHECK_SOC(tmp, "MT6771V", "Helio P70",       SOC_MEDIATEK, soc, 12)
-  //CHECK_SOC(tmp, "?",     "Helio P90",       SOC_MEDIATEK, soc, 12)
-  //CHECK_SOC(tmp, "?",     "Helio P95",       SOC_MEDIATEK, soc, 12)
-  CHECK_SOC(tmp, "MT6795",  "Helio X10",       SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6797",  "Helio X20 / X23", SOC_MEDIATEK, soc, 20)
-  //CHECK_SOC(tmp, "?",     "Helio X25",       SOC_MEDIATEK, soc, 20)
-  CHECK_SOC(tmp, "MT6797X", "Helio X27",       SOC_MEDIATEK, soc, 20)
-  CHECK_SOC(tmp, "MT6797",  "Helio X30",       SOC_MEDIATEK, soc, 10)
+  CHECK_SOC(tmp, "MT6761",  "Helio A22",       SOC_MTK_MT6761,  soc, 12)
+  CHECK_SOC(tmp, "MT6762D", "Helio A25",       SOC_MTK_MT6762D, soc, 12)
+  //CHECK_SOC(tmp, "?",     "Helio G25",       SOC_MTK_,        soc, 12)
+  //CHECK_SOC(tmp, "?",     "Helio G35",       SOC_MTK_,        soc, 12)
+  //CHECK_SOC(tmp, "?",     "Helio G70",       SOC_MTK_,        soc, 12)
+  //CHECK_SOC(tmp, "?",     "Helio G80",       SOC_MTK_,        soc, 12)
+  //CHECK_SOC(tmp, "?",     "Helio G90",       SOC_MTK_,        soc, 12)
+  //CHECK_SOC(tmp, "?",     "Helio G90T",      SOC_MTK_,        soc, 12)
+  //CHECK_SOC(tmp, "?",     "Helio G95",       SOC_MTK_,        soc, 12)
+  CHECK_SOC(tmp, "MT6755M", "Helio P10",       SOC_MTK_MT6755M, soc, 28)
+  //CHECK_SOC(tmp, "?",     "Helio P15",       SOC_MTK_,        soc, 28)
+  CHECK_SOC(tmp, "MT6757",  "Helio P20",       SOC_MTK_MT6757,  soc, 16)
+  CHECK_SOC(tmp, "MT6762",  "Helio P22",       SOC_MTK_MT6762,  soc, 12)
+  CHECK_SOC(tmp, "MT6763T", "Helio P23",       SOC_MTK_MT6763T, soc, 16)
+  //CHECK_SOC(tmp, "?",     "Helio P25",       SOC_MTK_,        soc, 16)
+  //CHECK_SOC(tmp, "?",     "Helio P30",       SOC_MTK_,        soc, 16)
+  CHECK_SOC(tmp, "MT6765",  "Helio P35",       SOC_MTK_MT6765,  soc, 12)
+  //CHECK_SOC(tmp, "?",     "Helio P60",       SOC_MTK_,        soc, 12)
+  //CHECK_SOC(tmp, "?",     "Helio P65",       SOC_MTK_,        soc, 12)
+  CHECK_SOC(tmp, "MT6771V", "Helio P70",       SOC_MTK_MT6771V, soc, 12)
+  //CHECK_SOC(tmp, "?",     "Helio P90",       SOC_MTK_,        soc, 12)
+  //CHECK_SOC(tmp, "?",     "Helio P95",       SOC_MTK_,        soc, 12)
+  CHECK_SOC(tmp, "MT6795",  "Helio X10",       SOC_MTK_MT6795,  soc, 28)
+  CHECK_SOC(tmp, "MT6797",  "Helio X20 / X23", SOC_MTK_MT6797,  soc, 20)
+  //CHECK_SOC(tmp, "?",     "Helio X25",       SOC_MTK_,        soc, 20)
+  CHECK_SOC(tmp, "MT6797X", "Helio X27",       SOC_MTK_MT6797X, soc, 20)
+  CHECK_SOC(tmp, "MT6797",  "Helio X30",       SOC_MTK_MT6797,  soc, 10)
   // MT XXXX //
-  CHECK_SOC(tmp, "MT2523",  "MT2523",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT2601",  "MT2601",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6515",  "MT6515",          SOC_MEDIATEK, soc, 40)
-  CHECK_SOC(tmp, "MT6516",  "MT6516",          SOC_MEDIATEK, soc, 65)
-  CHECK_SOC(tmp, "MT6517",  "MT6517",          SOC_MEDIATEK, soc, 40)
-  CHECK_SOC(tmp, "MT6572",  "MT6572",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6572M", "MT6572M",         SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6573",  "MT6573",          SOC_MEDIATEK, soc, 65)
-  CHECK_SOC(tmp, "MT6575",  "MT6575",          SOC_MEDIATEK, soc, 40)
-  CHECK_SOC(tmp, "MT6577",  "MT6577",          SOC_MEDIATEK, soc, 40)
-  CHECK_SOC(tmp, "MT6577T", "MT6577T",         SOC_MEDIATEK, soc, 40)
-  CHECK_SOC(tmp, "MT6580",  "MT6580",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6582",  "MT6582",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6582M", "MT6582M",         SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6589",  "MT6589",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6589",  "MT6589",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6589T", "MT6589T",         SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6592",  "MT6592",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6595",  "MT6595",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6732",  "MT6732",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6735",  "MT6735",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6735M", "MT6735M",         SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6735P", "MT6735P",         SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6737",  "MT6737",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6737M", "MT6737M",         SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6737T", "MT6737T",         SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6739",  "MT6739",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6750",  "MT6750",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6750S", "MT6750S",         SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6750T", "MT6750T",         SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6752",  "MT6752",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6753",  "MT6753",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6795",  "MT6795",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT6850",  "MT6850",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT7697",  "MT7697",          SOC_MEDIATEK, soc, 40)
-  CHECK_SOC(tmp, "MT8121",  "MT8121",          SOC_MEDIATEK, soc, 40)
-  CHECK_SOC(tmp, "MT8125",  "MT8125",          SOC_MEDIATEK, soc, 40)
-  CHECK_SOC(tmp, "MT8127",  "MT8127",          SOC_MEDIATEK, soc, 32)
-  CHECK_SOC(tmp, "MT8135",  "MT8135",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT8163A", "MT8163A",         SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT8163B", "MT8163B",         SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT8167B", "MT8167B",         SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT8173",  "MT8173",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT8176",  "MT8176",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT8321",  "MT8321",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT8382",  "MT8382",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT8581",  "MT8581",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT8735",  "MT8735",          SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT8765B", "MT8765B",         SOC_MEDIATEK, soc, 28)
-  CHECK_SOC(tmp, "MT8783",  "MT8783",          SOC_MEDIATEK, soc, 28)
+  CHECK_SOC(tmp, "MT2523",  "MT2523",          SOC_MTK_MT2523,  soc, 28)
+  CHECK_SOC(tmp, "MT2601",  "MT2601",          SOC_MTK_MT2601,  soc, 28)
+  CHECK_SOC(tmp, "MT6515",  "MT6515",          SOC_MTK_MT6515,  soc, 40)
+  CHECK_SOC(tmp, "MT6516",  "MT6516",          SOC_MTK_MT6516,  soc, 65)
+  CHECK_SOC(tmp, "MT6517",  "MT6517",          SOC_MTK_MT6517,  soc, 40)
+  CHECK_SOC(tmp, "MT6572",  "MT6572",          SOC_MTK_MT6572,  soc, 28)
+  CHECK_SOC(tmp, "MT6572M", "MT6572M",         SOC_MTK_MT6572M, soc, 28)
+  CHECK_SOC(tmp, "MT6573",  "MT6573",          SOC_MTK_MT6573,  soc, 65)
+  CHECK_SOC(tmp, "MT6575",  "MT6575",          SOC_MTK_MT6575,  soc, 40)
+  CHECK_SOC(tmp, "MT6577",  "MT6577",          SOC_MTK_MT6577,  soc, 40)
+  CHECK_SOC(tmp, "MT6577T", "MT6577T",         SOC_MTK_MT6577T, soc, 40)
+  CHECK_SOC(tmp, "MT6580",  "MT6580",          SOC_MTK_MT6580,  soc, 28)
+  CHECK_SOC(tmp, "MT6582",  "MT6582",          SOC_MTK_MT6582,  soc, 28)
+  CHECK_SOC(tmp, "MT6582M", "MT6582M",         SOC_MTK_MT6582M, soc, 28)
+  CHECK_SOC(tmp, "MT6589",  "MT6589",          SOC_MTK_MT6589,  soc, 28)
+  CHECK_SOC(tmp, "MT6589T", "MT6589T",         SOC_MTK_MT6589T, soc, 28)
+  CHECK_SOC(tmp, "MT6592",  "MT6592",          SOC_MTK_MT6592,  soc, 28)
+  CHECK_SOC(tmp, "MT6595",  "MT6595",          SOC_MTK_MT6595,  soc, 28)
+  CHECK_SOC(tmp, "MT6732",  "MT6732",          SOC_MTK_MT6732,  soc, 28)
+  CHECK_SOC(tmp, "MT6735",  "MT6735",          SOC_MTK_MT6735,  soc, 28)
+  CHECK_SOC(tmp, "MT6735M", "MT6735M",         SOC_MTK_MT6735M, soc, 28)
+  CHECK_SOC(tmp, "MT6735P", "MT6735P",         SOC_MTK_MT6735P, soc, 28)
+  CHECK_SOC(tmp, "MT6737",  "MT6737",          SOC_MTK_MT6737,  soc, 28)
+  CHECK_SOC(tmp, "MT6737M", "MT6737M",         SOC_MTK_MT6737M, soc, 28)
+  CHECK_SOC(tmp, "MT6737T", "MT6737T",         SOC_MTK_MT6737T, soc, 28)
+  CHECK_SOC(tmp, "MT6739",  "MT6739",          SOC_MTK_MT6739,  soc, 28)
+  CHECK_SOC(tmp, "MT6750",  "MT6750",          SOC_MTK_MT6750,  soc, 28)
+  CHECK_SOC(tmp, "MT6750S", "MT6750S",         SOC_MTK_MT6750S, soc, 28)
+  CHECK_SOC(tmp, "MT6750T", "MT6750T",         SOC_MTK_MT6750T, soc, 28)
+  CHECK_SOC(tmp, "MT6752",  "MT6752",          SOC_MTK_MT6752,  soc, 28)
+  CHECK_SOC(tmp, "MT6753",  "MT6753",          SOC_MTK_MT6753,  soc, 28)
+  CHECK_SOC(tmp, "MT6850",  "MT6850",          SOC_MTK_MT6850,  soc, 28)
+  CHECK_SOC(tmp, "MT7697",  "MT7697",          SOC_MTK_MT7697,  soc, 40)
+  CHECK_SOC(tmp, "MT8121",  "MT8121",          SOC_MTK_MT8121,  soc, 40)
+  CHECK_SOC(tmp, "MT8125",  "MT8125",          SOC_MTK_MT8125,  soc, 40)
+  CHECK_SOC(tmp, "MT8127",  "MT8127",          SOC_MTK_MT8127,  soc, 32)
+  CHECK_SOC(tmp, "MT8135",  "MT8135",          SOC_MTK_MT8135,  soc, 28)
+  CHECK_SOC(tmp, "MT8163A", "MT8163A",         SOC_MTK_MT8163A, soc, 28)
+  CHECK_SOC(tmp, "MT8163B", "MT8163B",         SOC_MTK_MT8163B, soc, 28)
+  CHECK_SOC(tmp, "MT8167B", "MT8167B",         SOC_MTK_MT8167B, soc, 28)
+  CHECK_SOC(tmp, "MT8173",  "MT8173",          SOC_MTK_MT8173,  soc, 28)
+  CHECK_SOC(tmp, "MT8176",  "MT8176",          SOC_MTK_MT8176,  soc, 28)
+  CHECK_SOC(tmp, "MT8321",  "MT8321",          SOC_MTK_MT8321,  soc, 28)
+  CHECK_SOC(tmp, "MT8382",  "MT8382",          SOC_MTK_MT8382,  soc, 28)
+  CHECK_SOC(tmp, "MT8581",  "MT8581",          SOC_MTK_MT8581,  soc, 28)
+  CHECK_SOC(tmp, "MT8735",  "MT8735",          SOC_MTK_MT8735,  soc, 28)
+  CHECK_SOC(tmp, "MT8765B", "MT8765B",         SOC_MTK_MT8765B, soc, 28)
+  CHECK_SOC(tmp, "MT8783",  "MT8783",          SOC_MTK_MT8783,  soc, 28)
   SOC_END
 }
 
@@ -275,116 +275,117 @@ bool match_qualcomm(char* soc_name, struct system_on_chip* soc) {
   else if((tmp = strstr(soc_name_upper, "APQ")) != NULL);
   else if((tmp = strstr(soc_name_upper, "SM")) != NULL);    
   else if((tmp = strstr(soc_name_upper, "QM")) != NULL);      
+  else if((tmp = strstr(soc_name_upper, "QSD")) != NULL);
   else return false;
   
   SOC_START
   // Snapdragon S1 //
-  CHECK_SOC(tmp, "MSM7627A",       "S1",        SOC_SNAPDRAGON, soc, 65) 
-  CHECK_SOC(tmp, "MSM7225",        "S1",        SOC_SNAPDRAGON, soc, 65) 
-  CHECK_SOC(tmp, "MSM7625",        "S1",        SOC_SNAPDRAGON, soc, 65) 
-  CHECK_SOC(tmp, "MSM7625A",       "S1",        SOC_SNAPDRAGON, soc, 45) 
-  CHECK_SOC(tmp, "MSM7627",        "S1",        SOC_SNAPDRAGON, soc, 65) 
-  CHECK_SOC(tmp, "MSM7227A",       "S1",        SOC_SNAPDRAGON, soc, 45) 
-  CHECK_SOC(tmp, "QSD8250",        "S1",        SOC_SNAPDRAGON, soc, 65) 
-  CHECK_SOC(tmp, "MSM7227",        "S1",        SOC_SNAPDRAGON, soc, 65) 
-  CHECK_SOC(tmp, "MSM7225A",       "S1",        SOC_SNAPDRAGON, soc, 45) 
+  CHECK_SOC(tmp, "MSM7627A",       "S1",        SOC_SNAPD_MSM7627A,       soc, 65) 
+  CHECK_SOC(tmp, "MSM7225",        "S1",        SOC_SNAPD_MSM7225,        soc, 65) 
+  CHECK_SOC(tmp, "MSM7625",        "S1",        SOC_SNAPD_MSM7625,        soc, 65) 
+  CHECK_SOC(tmp, "MSM7625A",       "S1",        SOC_SNAPD_MSM7625A,       soc, 45) 
+  CHECK_SOC(tmp, "MSM7627",        "S1",        SOC_SNAPD_MSM7627,        soc, 65) 
+  CHECK_SOC(tmp, "MSM7227A",       "S1",        SOC_SNAPD_MSM7227A,       soc, 45) 
+  CHECK_SOC(tmp, "QSD8250",        "S1",        SOC_SNAPD_QSD8250,        soc, 65) 
+  CHECK_SOC(tmp, "MSM7227",        "S1",        SOC_SNAPD_MSM7227,        soc, 65) 
+  CHECK_SOC(tmp, "MSM7225A",       "S1",        SOC_SNAPD_MSM7225A,       soc, 45) 
   // Snapdragon S2 //
-  CHECK_SOC(tmp, "MSM7230",        "S2",        SOC_SNAPDRAGON, soc, 45) 
-  CHECK_SOC(tmp, "MSM8655T",       "S2",        SOC_SNAPDRAGON, soc, 45) 
-  CHECK_SOC(tmp, "MSM8255",        "S2",        SOC_SNAPDRAGON, soc, 45) 
-  CHECK_SOC(tmp, "MSM8255T",       "S2",        SOC_SNAPDRAGON, soc, 45) 
-  CHECK_SOC(tmp, "MSM8655",        "S2",        SOC_SNAPDRAGON, soc, 45) 
-  CHECK_SOC(tmp, "APQ8055",        "S2",        SOC_SNAPDRAGON, soc, 45) 
+  CHECK_SOC(tmp, "MSM7230",        "S2",        SOC_SNAPD_MSM7230,        soc, 45) 
+  CHECK_SOC(tmp, "MSM8655T",       "S2",        SOC_SNAPD_MSM8655T,       soc, 45) 
+  CHECK_SOC(tmp, "MSM8255",        "S2",        SOC_SNAPD_MSM8255,        soc, 45) 
+  CHECK_SOC(tmp, "MSM8255T",       "S2",        SOC_SNAPD_MSM8255T,       soc, 45) 
+  CHECK_SOC(tmp, "MSM8655",        "S2",        SOC_SNAPD_MSM8655,        soc, 45) 
+  CHECK_SOC(tmp, "APQ8055",        "S2",        SOC_SNAPD_APQ8055,        soc, 45) 
   // Snapdragon S3 //
-  CHECK_SOC(tmp, "MSM8260",        "S3",        SOC_SNAPDRAGON, soc, 45) 
-  CHECK_SOC(tmp, "MSM8660",        "S3",        SOC_SNAPDRAGON, soc, 45) 
-  CHECK_SOC(tmp, "APQ8060",        "S3",        SOC_SNAPDRAGON, soc, 45) 
+  CHECK_SOC(tmp, "MSM8260",        "S3",        SOC_SNAPD_MSM8260,        soc, 45) 
+  CHECK_SOC(tmp, "MSM8660",        "S3",        SOC_SNAPD_MSM8660,        soc, 45) 
+  CHECK_SOC(tmp, "APQ8060",        "S3",        SOC_SNAPD_APQ8060,        soc, 45) 
   // Snapdragon S4 //
-  CHECK_SOC(tmp, "MSM8225",        "S4 Play",   SOC_SNAPDRAGON, soc, 45) 
-  CHECK_SOC(tmp, "MSM8225Q",       "S4 Play",   SOC_SNAPDRAGON, soc, 45) 
-  CHECK_SOC(tmp, "MSM8227",        "S4 Plus",   SOC_SNAPDRAGON, soc, 28) 
-  CHECK_SOC(tmp, "MSM8960",        "S4 Plus",   SOC_SNAPDRAGON, soc, 28) 
-  CHECK_SOC(tmp, "MSM8930",        "S4 Plus",   SOC_SNAPDRAGON, soc, 28) 
-  CHECK_SOC(tmp, "MSM8260A",       "S4 Plus",   SOC_SNAPDRAGON, soc, 28) 
-  CHECK_SOC(tmp, "MSM8230",        "S4 Plus",   SOC_SNAPDRAGON, soc, 28) 
-  CHECK_SOC(tmp, "APQ8064",        "S4 Pro",    SOC_SNAPDRAGON, soc, 28) 
+  CHECK_SOC(tmp, "MSM8225",        "S4 Play",   SOC_SNAPD_MSM8225,        soc, 45) 
+  CHECK_SOC(tmp, "MSM8225Q",       "S4 Play",   SOC_SNAPD_MSM8225Q,       soc, 45) 
+  CHECK_SOC(tmp, "MSM8227",        "S4 Plus",   SOC_SNAPD_MSM8227,        soc, 28) 
+  CHECK_SOC(tmp, "MSM8960",        "S4 Plus",   SOC_SNAPD_MSM8960,        soc, 28) 
+  CHECK_SOC(tmp, "MSM8930",        "S4 Plus",   SOC_SNAPD_MSM8930,        soc, 28) 
+  CHECK_SOC(tmp, "MSM8260A",       "S4 Plus",   SOC_SNAPD_MSM8260A,       soc, 28) 
+  CHECK_SOC(tmp, "MSM8230",        "S4 Plus",   SOC_SNAPD_MSM8230,        soc, 28) 
+  CHECK_SOC(tmp, "APQ8064",        "S4 Pro",    SOC_SNAPD_APQ8064,        soc, 28) 
   // Snapdragon 2XX //
-  CHECK_SOC(tmp, "MSM8212",        "200",       SOC_SNAPDRAGON, soc, 45) 
-  CHECK_SOC(tmp, "MSM8625Q",       "200",       SOC_SNAPDRAGON, soc, 45)
-  CHECK_SOC(tmp, "MSM8210",        "200",       SOC_SNAPDRAGON, soc, 45)
-  CHECK_SOC(tmp, "MSM8225Q",       "200",       SOC_SNAPDRAGON, soc, 45)
-  CHECK_SOC(tmp, "MSM8208",        "208",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "MSM8909",        "210",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "APQ8009",        "212",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "QM215",          "215",       SOC_SNAPDRAGON, soc, 28)
+  CHECK_SOC(tmp, "MSM8212",        "200",       SOC_SNAPD_MSM8212,        soc, 45) 
+  CHECK_SOC(tmp, "MSM8625Q",       "200",       SOC_SNAPD_MSM8625Q,       soc, 45)
+  CHECK_SOC(tmp, "MSM8210",        "200",       SOC_SNAPD_MSM8210,        soc, 45)
+  CHECK_SOC(tmp, "MSM8225Q",       "200",       SOC_SNAPD_MSM8225Q,       soc, 45)
+  CHECK_SOC(tmp, "MSM8208",        "208",       SOC_SNAPD_MSM8208,        soc, 28)
+  CHECK_SOC(tmp, "MSM8909",        "210",       SOC_SNAPD_MSM8909,        soc, 28)
+  CHECK_SOC(tmp, "APQ8009",        "212",       SOC_SNAPD_APQ8009,        soc, 28)
+  CHECK_SOC(tmp, "QM215",          "215",       SOC_SNAPD_QM215,          soc, 28)
   // Snapdragon 4XX //
-  CHECK_SOC(tmp, "MSM8226",        "400",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "MSM8926",        "400",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "MSM8930",        "400",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "MSM8928",        "400",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "MSM8230AB",      "400",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "MSM8228",        "400",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "MSM8930AA",      "400",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "MSM8916T",       "412",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "MSM8916",        "410",       SOC_SNAPDRAGON, soc, 28)  
-  CHECK_SOC(tmp, "MSM8929",        "415",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "MSM8917",        "425",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "MSM8920",        "427",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "SDM429",         "429",       SOC_SNAPDRAGON, soc, 12)
-  CHECK_SOC(tmp, "MSM8937",        "430",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "MSM8940",        "435",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "SDM439",         "439",       SOC_SNAPDRAGON, soc, 12)
-  CHECK_SOC(tmp, "SDM450",         "450",       SOC_SNAPDRAGON, soc, 14)
-  CHECK_SOC(tmp, "SM4250",         "460",       SOC_SNAPDRAGON, soc, 11)
+  CHECK_SOC(tmp, "MSM8226",        "400",       SOC_SNAPD_MSM8226,        soc, 28)
+  CHECK_SOC(tmp, "MSM8926",        "400",       SOC_SNAPD_MSM8926,        soc, 28)
+  CHECK_SOC(tmp, "MSM8930",        "400",       SOC_SNAPD_MSM8930,        soc, 28)
+  CHECK_SOC(tmp, "MSM8928",        "400",       SOC_SNAPD_MSM8928,        soc, 28)
+  CHECK_SOC(tmp, "MSM8230AB",      "400",       SOC_SNAPD_MSM8230AB,      soc, 28)
+  CHECK_SOC(tmp, "MSM8228",        "400",       SOC_SNAPD_MSM8228,        soc, 28)
+  CHECK_SOC(tmp, "MSM8930AA",      "400",       SOC_SNAPD_MSM8930AA,      soc, 28)
+  CHECK_SOC(tmp, "MSM8916T",       "412",       SOC_SNAPD_MSM8916T,       soc, 28)
+  CHECK_SOC(tmp, "MSM8916",        "410",       SOC_SNAPD_MSM8916,        soc, 28)  
+  CHECK_SOC(tmp, "MSM8929",        "415",       SOC_SNAPD_MSM8929,        soc, 28)
+  CHECK_SOC(tmp, "MSM8917",        "425",       SOC_SNAPD_MSM8917,        soc, 28)
+  CHECK_SOC(tmp, "MSM8920",        "427",       SOC_SNAPD_MSM8920,        soc, 28)
+  CHECK_SOC(tmp, "SDM429",         "429",       SOC_SNAPD_SDM429,         soc, 12)
+  CHECK_SOC(tmp, "MSM8937",        "430",       SOC_SNAPD_MSM8937,        soc, 28)
+  CHECK_SOC(tmp, "MSM8940",        "435",       SOC_SNAPD_MSM8940,        soc, 28)
+  CHECK_SOC(tmp, "SDM439",         "439",       SOC_SNAPD_SDM439,         soc, 12)
+  CHECK_SOC(tmp, "SDM450",         "450",       SOC_SNAPD_SDM450,         soc, 14)
+  CHECK_SOC(tmp, "SM4250",         "460",       SOC_SNAPD_SM4250,         soc, 11)
   // Snapdragon 6XX //
-  CHECK_SOC(tmp, "APQ8064T",       "600",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "MSM8936",        "610",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "MSM8939",        "615 / 616", SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "MSM8952",        "617",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "MSM8953",        "625",       SOC_SNAPDRAGON, soc, 14)
-  CHECK_SOC(tmp, "MSM8953 PRO",    "626",       SOC_SNAPDRAGON, soc, 14)
-  CHECK_SOC(tmp, "SDM630",         "630",       SOC_SNAPDRAGON, soc, 14)
-  CHECK_SOC(tmp, "SDM632",         "632",       SOC_SNAPDRAGON, soc, 12)
-  CHECK_SOC(tmp, "SDM636",         "636",       SOC_SNAPDRAGON, soc, 14)
-  CHECK_SOC(tmp, "MSM8956",        "650",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "MSM8976",        "652",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "MSM8976 PRO",    "653",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "SDM660",         "660",       SOC_SNAPDRAGON, soc, 14)
-  CHECK_SOC(tmp, "SM6115",         "662",       SOC_SNAPDRAGON, soc, 11)
-  CHECK_SOC(tmp, "SM6125",         "665",       SOC_SNAPDRAGON, soc, 11)
-  CHECK_SOC(tmp, "SDM670",         "670",       SOC_SNAPDRAGON, soc, 10)
-  CHECK_SOC(tmp, "SDM675",         "675",       SOC_SNAPDRAGON, soc, 11)
-  CHECK_SOC(tmp, "SDM690",         "690",       SOC_SNAPDRAGON, soc,  8)
+  CHECK_SOC(tmp, "APQ8064T",       "600",       SOC_SNAPD_APQ8064T,       soc, 28)
+  CHECK_SOC(tmp, "MSM8936",        "610",       SOC_SNAPD_MSM8936,        soc, 28)
+  CHECK_SOC(tmp, "MSM8939",        "615 / 616", SOC_SNAPD_MSM8939,        soc, 28)
+  CHECK_SOC(tmp, "MSM8952",        "617",       SOC_SNAPD_MSM8952,        soc, 28)
+  CHECK_SOC(tmp, "MSM8953",        "625",       SOC_SNAPD_MSM8953,        soc, 14)
+  CHECK_SOC(tmp, "MSM8953 PRO",    "626",       SOC_SNAPD_MSM8953_PRO,    soc, 14)
+  CHECK_SOC(tmp, "SDM630",         "630",       SOC_SNAPD_SDM630,         soc, 14)
+  CHECK_SOC(tmp, "SDM632",         "632",       SOC_SNAPD_SDM632,         soc, 12)
+  CHECK_SOC(tmp, "SDM636",         "636",       SOC_SNAPD_SDM636,         soc, 14)
+  CHECK_SOC(tmp, "MSM8956",        "650",       SOC_SNAPD_MSM8956,        soc, 28)
+  CHECK_SOC(tmp, "MSM8976",        "652",       SOC_SNAPD_MSM8976,        soc, 28)
+  CHECK_SOC(tmp, "MSM8976 PRO",    "653",       SOC_SNAPD_MSM8976_PRO,    soc, 28)
+  CHECK_SOC(tmp, "SDM660",         "660",       SOC_SNAPD_SDM660,         soc, 14)
+  CHECK_SOC(tmp, "SM6115",         "662",       SOC_SNAPD_SM6115,         soc, 11)
+  CHECK_SOC(tmp, "SM6125",         "665",       SOC_SNAPD_SM6125,         soc, 11)
+  CHECK_SOC(tmp, "SDM670",         "670",       SOC_SNAPD_SDM670,         soc, 10)
+  CHECK_SOC(tmp, "SDM675",         "675",       SOC_SNAPD_SDM675,         soc, 11)
+  CHECK_SOC(tmp, "SDM690",         "690",       SOC_SNAPD_SDM690,         soc,  8)
   // Snapdragon 7XX //
-  //CHECK_SOC(tmp, "?",            "710",       SOC_SNAPDRAGON, soc, 10)
-  //CHECK_SOC(tmp, "?",            "712",       SOC_SNAPDRAGON, soc, 10)
-  CHECK_SOC(tmp, "SM7125",         "720G",      SOC_SNAPDRAGON, soc,  8)
-  CHECK_SOC(tmp, "SM7150-AA",      "730",       SOC_SNAPDRAGON, soc,  8)
-  CHECK_SOC(tmp, "SM7150-AB",      "730G",      SOC_SNAPDRAGON, soc,  8)
-  CHECK_SOC(tmp, "SM7150-AC",      "732G",      SOC_SNAPDRAGON, soc,  8)
-  CHECK_SOC(tmp, "SM7225",         "750G",      SOC_SNAPDRAGON, soc,  8)
-  CHECK_SOC(tmp, "SM7250-AA",      "765",       SOC_SNAPDRAGON, soc,  7)
-  CHECK_SOC(tmp, "SM7250-AB",      "765G",      SOC_SNAPDRAGON, soc,  7)
-  CHECK_SOC(tmp, "SM7250-AC",      "768G",      SOC_SNAPDRAGON, soc,  7)
+  //CHECK_SOC(tmp, "?",            "710",       SOC_SNAPD_,               soc, 10)
+  //CHECK_SOC(tmp, "?",            "712",       SOC_SNAPD_,               soc, 10)
+  CHECK_SOC(tmp, "SM7125",         "720G",      SOC_SNAPD_SM7125,         soc,  8)
+  CHECK_SOC(tmp, "SM7150-AA",      "730",       SOC_SNAPD_SM7150_AA,      soc,  8)
+  CHECK_SOC(tmp, "SM7150-AB",      "730G",      SOC_SNAPD_SM7150_AB,      soc,  8)
+  CHECK_SOC(tmp, "SM7150-AC",      "732G",      SOC_SNAPD_SM7150_AC,      soc,  8)
+  CHECK_SOC(tmp, "SM7225",         "750G",      SOC_SNAPD_SM7225,         soc,  8)
+  CHECK_SOC(tmp, "SM7250-AA",      "765",       SOC_SNAPD_SM7250_AA,      soc,  7)
+  CHECK_SOC(tmp, "SM7250-AB",      "765G",      SOC_SNAPD_SM7250_AB,      soc,  7)
+  CHECK_SOC(tmp, "SM7250-AC",      "768G",      SOC_SNAPD_SM7250_AC,      soc,  7)
   // Snapdragon 8XX //
-  CHECK_SOC(tmp, "MSM8974AA",      "800",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "MSM8974AB",      "800",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "MSM8974AC",      "800",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "MSM8974PRO-AB",  "801",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "MSM8974PRO-AC",  "801",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "APQ8084",        "805",       SOC_SNAPDRAGON, soc, 28)
-  CHECK_SOC(tmp, "MSM8992",        "808",       SOC_SNAPDRAGON, soc, 20)
-  CHECK_SOC(tmp, "MSM8994",        "810",       SOC_SNAPDRAGON, soc, 20)
-  CHECK_SOC(tmp, "MSM8996",        "820",       SOC_SNAPDRAGON, soc, 14)
-  CHECK_SOC(tmp, "MSM8996 PRO A",  "821",       SOC_SNAPDRAGON, soc, 14)
-  CHECK_SOC(tmp, "MSM8996 PRO AB", "821 AB",    SOC_SNAPDRAGON, soc, 14)
-  CHECK_SOC(tmp, "MSM8995",        "835",       SOC_SNAPDRAGON, soc, 10)
-  //CHECK_SOC(tmp, "?",            "845",       SOC_SNAPDRAGON, soc, 10)
-  //CHECK_SOC(tmp, "?",            "850",       SOC_SNAPDRAGON, soc, 10)
-  CHECK_SOC(tmp, "SM8150",         "855",       SOC_SNAPDRAGON, soc,  7)
-  //CHECK_SOC(tmp, "?",            "855+",      SOC_SNAPDRAGON, soc,  7)
-  CHECK_SOC(tmp, "SM8250",         "865",       SOC_SNAPDRAGON, soc,  7)
-  CHECK_SOC(tmp, "SM8250-AB",      "865+",      SOC_SNAPDRAGON, soc,  7)
+  CHECK_SOC(tmp, "MSM8974AA",      "800",       SOC_SNAPD_MSM8974AA,      soc, 28)
+  CHECK_SOC(tmp, "MSM8974AB",      "800",       SOC_SNAPD_MSM8974AB,      soc, 28)
+  CHECK_SOC(tmp, "MSM8974AC",      "800",       SOC_SNAPD_MSM8974AC,      soc, 28)
+  CHECK_SOC(tmp, "MSM8974PRO-AB",  "801",       SOC_SNAPD_MSM8974PRO_AB,  soc, 28)
+  CHECK_SOC(tmp, "MSM8974PRO-AC",  "801",       SOC_SNAPD_MSM8974PRO_AC,  soc, 28)
+  CHECK_SOC(tmp, "APQ8084",        "805",       SOC_SNAPD_APQ8084,        soc, 28)
+  CHECK_SOC(tmp, "MSM8992",        "808",       SOC_SNAPD_MSM8992,        soc, 20)
+  CHECK_SOC(tmp, "MSM8994",        "810",       SOC_SNAPD_MSM8994,        soc, 20)
+  CHECK_SOC(tmp, "MSM8996",        "820",       SOC_SNAPD_MSM8996,        soc, 14)
+  CHECK_SOC(tmp, "MSM8996 PRO A",  "821",       SOC_SNAPD_MSM8996_PRO_A,  soc, 14)
+  CHECK_SOC(tmp, "MSM8996 PRO AB", "821 AB",    SOC_SNAPD_MSM8996_PRO_AB, soc, 14)
+  CHECK_SOC(tmp, "MSM8995",        "835",       SOC_SNAPD_MSM8995,        soc, 10)
+  //CHECK_SOC(tmp, "?",            "845",       SOC_SNAPD_,               soc, 10)
+  //CHECK_SOC(tmp, "?",            "850",       SOC_SNAPD_,               soc, 10)
+  CHECK_SOC(tmp, "SM8150",         "855",       SOC_SNAPD_SM8150,         soc,  7)
+  //CHECK_SOC(tmp, "?",            "855+",      SOC_SNAPD_,               soc,  7)
+  CHECK_SOC(tmp, "SM8250",         "865",       SOC_SNAPD_SM8250,         soc,  7)
+  CHECK_SOC(tmp, "SM8250-AB",      "865+",      SOC_SNAPD_SM8250_AB,      soc,  7)
   SOC_END
 }
 
@@ -393,7 +394,7 @@ bool match_special(char* soc_name, struct system_on_chip* soc) {
 
   // Xiaomi hides Redmi Note 8/8T under "Qualcomm Technologies, Inc TRINKET"
   if((tmp = strstr(soc_name, "TRINKET")) != NULL) {
-    fill_soc(soc, "665", SOC_SNAPDRAGON, 11);
+    fill_soc(soc, "665", SOC_SNAPD_SM6125, 11);
     return true;
   }
   
@@ -439,7 +440,7 @@ struct system_on_chip* guess_soc_from_android(struct system_on_chip* soc) {
     soc->raw_name = malloc(sizeof(char) * (property_len + 1));
     strncpy(soc->raw_name, tmp, property_len + 1);
     soc->raw_name[property_len] = '\0';
-    soc->soc_vendor = SOC_UNKNOWN;
+    soc->soc_vendor = SOC_VENDOR_UNKNOWN;
     return parse_soc_from_string(soc);
   }
   
@@ -448,7 +449,7 @@ struct system_on_chip* guess_soc_from_android(struct system_on_chip* soc) {
     soc->raw_name = malloc(sizeof(char) * (property_len + 1));
     strncpy(soc->raw_name, tmp, property_len + 1);
     soc->raw_name[property_len] = '\0';
-    soc->soc_vendor = SOC_UNKNOWN;
+    soc->soc_vendor = SOC_VENDOR_UNKNOWN;
     return parse_soc_from_string(soc);
   }    
   
@@ -470,11 +471,11 @@ struct system_on_chip* guess_soc_from_cpuinfo(struct system_on_chip* soc) {
 struct system_on_chip* get_soc() {
   struct system_on_chip* soc = malloc(sizeof(struct system_on_chip));
   soc->raw_name = NULL;
-  soc->soc_vendor = SOC_UNKNOWN;
+  soc->soc_vendor = SOC_VENDOR_UNKNOWN;
   soc->process = UNKNOWN;
   
   soc = guess_soc_from_cpuinfo(soc);
-  if(soc->soc_vendor == SOC_UNKNOWN) {
+  if(soc->soc_vendor == SOC_VENDOR_UNKNOWN) {
     if(soc->raw_name != NULL)
       printBug("SoC detection failed using /proc/cpuinfo: Found '%s' string", soc->raw_name);   
     else
@@ -483,7 +484,7 @@ struct system_on_chip* get_soc() {
     soc = guess_soc_from_android(soc);
     if(soc->raw_name == NULL)
       printWarn("SoC detection failed using Android: No string found");
-    else if(soc->soc_vendor == SOC_UNKNOWN)
+    else if(soc->soc_vendor == SOC_VENDOR_UNKNOWN)
       printBug("SoC detection failed using Android: Found '%s' string", soc->raw_name);   
 #endif
   }
@@ -497,7 +498,7 @@ struct system_on_chip* get_soc() {
 }
 
 char* get_soc_name(struct system_on_chip* soc) {
-  if(soc->soc_vendor == SOC_UNKNOWN)
+  if(soc->soc_vendor == SOC_VENDOR_UNKNOWN)
     return soc->raw_name;
   return soc->soc_name;
 }
diff --git a/src/arm/soc.h b/src/arm/soc.h
index 0aa1e23..1dc10b3 100644
--- a/src/arm/soc.h
+++ b/src/arm/soc.h
@@ -4,16 +4,19 @@
 #include "../common/cpu.h"
 #include <stdint.h>
 
+typedef int32_t SOC;
+
 enum {
-  SOC_UNKNOWN,
-  SOC_SNAPDRAGON,
-  SOC_MEDIATEK,
-  SOC_EXYNOS,
-  SOC_KIRIN,
-  SOC_BROADCOM
+  SOC_VENDOR_UNKNOWN,
+  SOC_VENDOR_SNAPDRAGON,
+  SOC_VENDOR_MEDIATEK,
+  SOC_VENDOR_EXYNOS,
+  SOC_VENDOR_KIRIN,
+  SOC_VENDOR_BROADCOM
 };
 
 struct system_on_chip {
+  SOC soc_model;
   VENDOR soc_vendor;
   int32_t process;
   char* soc_name;
diff --git a/src/arm/socs.h b/src/arm/socs.h
new file mode 100644
index 0000000..44dea2d
--- /dev/null
+++ b/src/arm/socs.h
@@ -0,0 +1,229 @@
+#ifndef __SOCS__
+#define __SOCS__
+
+#include "soc.h"
+
+// List of supported SOCs
+enum {
+  // Broadcom //
+  SOC_BCM_2835,
+  SOC_BCM_2836,
+  SOC_BCM_2837,
+  SOC_BCM_2837B0,
+  SOC_BCM_2711,
+  SOC_BCM_21553,
+  SOC_BCM_21553T,
+  SOC_BCM_21663,
+  SOC_BCM_21664,
+  SOC_BCM_28155,
+  SOC_BCM_23550,
+  SOC_BCM_28145,
+  SOC_BCM_2157,
+  SOC_BCM_21654,
+  // Hisilicon //
+  SOC_HISILICON_3620,
+  SOC_HISILICON_3630,
+  SOC_HISILICON_3650,
+  SOC_HISILICON_3660,
+  SOC_HISILICON_3670,
+  SOC_HISILICON_3680,
+  SOC_HISILICON_3690,
+  // Exynos //
+  SOC_EXYNOS_3475,
+  SOC_EXYNOS_4210,
+  SOC_EXYNOS_4212,
+  SOC_EXYNOS_4412,
+  SOC_EXYNOS_5250,
+  SOC_EXYNOS_5410,
+  SOC_EXYNOS_5420,
+  SOC_EXYNOS_5422,
+  SOC_EXYNOS_5430,
+  SOC_EXYNOS_5433,
+  SOC_EXYNOS_5260,
+  SOC_EXYNOS_7270,
+  SOC_EXYNOS_7420,
+  SOC_EXYNOS_7570,
+  SOC_EXYNOS_7870,
+  SOC_EXYNOS_7872,
+  SOC_EXYNOS_7880,
+  SOC_EXYNOS_7884,
+  SOC_EXYNOS_7885,
+  SOC_EXYNOS_7904,
+  SOC_EXYNOS_8890,
+  SOC_EXYNOS_8895,
+  SOC_EXYNOS_9110,
+  SOC_EXYNOS_9609,
+  SOC_EXYNOS_9610,
+  SOC_EXYNOS_9611,
+  SOC_EXYNOS_9810,
+  SOC_EXYNOS_9820,
+  SOC_EXYNOS_9825,
+  SOC_EXYNOS_1080,
+  SOC_EXYNOS_990,
+  SOC_EXYNOS_980,
+  SOC_EXYNOS_880,
+  // Mediatek //
+  SOC_MTK_MT6873,
+  SOC_MTK_MT6761,
+  SOC_MTK_MT6762D,
+  SOC_MTK_MT6755M,
+  SOC_MTK_MT6757,
+  SOC_MTK_MT6762,
+  SOC_MTK_MT6763T,
+  SOC_MTK_MT6765,
+  SOC_MTK_MT6771V,
+  SOC_MTK_MT6795,
+  SOC_MTK_MT6797,
+  SOC_MTK_MT6797X,
+  SOC_MTK_MT2523,
+  SOC_MTK_MT2601,
+  SOC_MTK_MT6515,
+  SOC_MTK_MT6516,
+  SOC_MTK_MT6517,
+  SOC_MTK_MT6572,
+  SOC_MTK_MT6572M,
+  SOC_MTK_MT6573,
+  SOC_MTK_MT6575,
+  SOC_MTK_MT6577,
+  SOC_MTK_MT6577T,
+  SOC_MTK_MT6580,
+  SOC_MTK_MT6582,
+  SOC_MTK_MT6582M,
+  SOC_MTK_MT6589,
+  SOC_MTK_MT6589T,
+  SOC_MTK_MT6592,
+  SOC_MTK_MT6595,
+  SOC_MTK_MT6732,
+  SOC_MTK_MT6735,
+  SOC_MTK_MT6735M,
+  SOC_MTK_MT6735P,
+  SOC_MTK_MT6737,
+  SOC_MTK_MT6737M,
+  SOC_MTK_MT6737T,
+  SOC_MTK_MT6739,
+  SOC_MTK_MT6750,
+  SOC_MTK_MT6750S,
+  SOC_MTK_MT6750T,
+  SOC_MTK_MT6752,
+  SOC_MTK_MT6753,
+  SOC_MTK_MT6850,
+  SOC_MTK_MT7697,
+  SOC_MTK_MT8121,
+  SOC_MTK_MT8125,
+  SOC_MTK_MT8127,
+  SOC_MTK_MT8135,
+  SOC_MTK_MT8163A,
+  SOC_MTK_MT8163B,
+  SOC_MTK_MT8167B,
+  SOC_MTK_MT8173,
+  SOC_MTK_MT8176,
+  SOC_MTK_MT8321,
+  SOC_MTK_MT8382,
+  SOC_MTK_MT8581,
+  SOC_MTK_MT8735,
+  SOC_MTK_MT8765B,
+  SOC_MTK_MT8783,
+  // Snapdragon //
+  SOC_SNAPD_MSM7627A,
+  SOC_SNAPD_MSM7225,
+  SOC_SNAPD_MSM7625,
+  SOC_SNAPD_MSM7625A,
+  SOC_SNAPD_MSM7627,
+  SOC_SNAPD_MSM7227A,
+  SOC_SNAPD_QSD8250,
+  SOC_SNAPD_MSM7227,
+  SOC_SNAPD_MSM7225A,
+  SOC_SNAPD_MSM7230,
+  SOC_SNAPD_MSM8655T,
+  SOC_SNAPD_MSM8255,
+  SOC_SNAPD_MSM8255T,
+  SOC_SNAPD_MSM8655,
+  SOC_SNAPD_APQ8055,
+  SOC_SNAPD_MSM8260,
+  SOC_SNAPD_MSM8660,
+  SOC_SNAPD_APQ8060,
+  SOC_SNAPD_MSM8225,
+  SOC_SNAPD_MSM8227,
+  SOC_SNAPD_MSM8960,
+  SOC_SNAPD_MSM8260A,
+  SOC_SNAPD_MSM8230,
+  SOC_SNAPD_APQ8064,
+  SOC_SNAPD_MSM8212,
+  SOC_SNAPD_MSM8625Q,
+  SOC_SNAPD_MSM8210,
+  SOC_SNAPD_MSM8225Q,
+  SOC_SNAPD_MSM8208,
+  SOC_SNAPD_MSM8909,
+  SOC_SNAPD_APQ8009,
+  SOC_SNAPD_QM215,
+  SOC_SNAPD_MSM8226,
+  SOC_SNAPD_MSM8926,
+  SOC_SNAPD_MSM8930,
+  SOC_SNAPD_MSM8928,
+  SOC_SNAPD_MSM8230AB,
+  SOC_SNAPD_MSM8228,
+  SOC_SNAPD_MSM8930AA,
+  SOC_SNAPD_MSM8916T,
+  SOC_SNAPD_MSM8916,
+  SOC_SNAPD_MSM8929,
+  SOC_SNAPD_MSM8917,
+  SOC_SNAPD_MSM8920,
+  SOC_SNAPD_SDM429,
+  SOC_SNAPD_MSM8937,
+  SOC_SNAPD_MSM8940,
+  SOC_SNAPD_SDM439,
+  SOC_SNAPD_SDM450,
+  SOC_SNAPD_SM4250,
+  SOC_SNAPD_APQ8064T,
+  SOC_SNAPD_MSM8936,
+  SOC_SNAPD_MSM8939,
+  SOC_SNAPD_MSM8952,
+  SOC_SNAPD_MSM8953,
+  SOC_SNAPD_MSM8953_PRO,
+  SOC_SNAPD_SDM630,
+  SOC_SNAPD_SDM632,
+  SOC_SNAPD_SDM636,
+  SOC_SNAPD_MSM8956,
+  SOC_SNAPD_MSM8976,
+  SOC_SNAPD_MSM8976_PRO,
+  SOC_SNAPD_SDM660,
+  SOC_SNAPD_SM6115,
+  SOC_SNAPD_SM6125,
+  SOC_SNAPD_SDM670,
+  SOC_SNAPD_SDM675,
+  SOC_SNAPD_SDM690,
+  SOC_SNAPD_SM7125,
+  SOC_SNAPD_SM7150_AA,
+  SOC_SNAPD_SM7150_AB,
+  SOC_SNAPD_SM7150_AC,
+  SOC_SNAPD_SM7225,
+  SOC_SNAPD_SM7250_AA,
+  SOC_SNAPD_SM7250_AB,
+  SOC_SNAPD_SM7250_AC,
+  SOC_SNAPD_MSM8974AA,
+  SOC_SNAPD_MSM8974AB,
+  SOC_SNAPD_MSM8974AC,
+  SOC_SNAPD_MSM8974PRO_AB,
+  SOC_SNAPD_MSM8974PRO_AC,
+  SOC_SNAPD_APQ8084,
+  SOC_SNAPD_MSM8992,
+  SOC_SNAPD_MSM8994,
+  SOC_SNAPD_MSM8996,
+  SOC_SNAPD_MSM8996_PRO_A,
+  SOC_SNAPD_MSM8996_PRO_AB,
+  SOC_SNAPD_MSM8995,
+  SOC_SNAPD_SM8150,
+  SOC_SNAPD_SM8250,
+  SOC_SNAPD_SM8250_AB,
+};
+
+inline static VENDOR get_soc_vendor_from_soc(SOC soc) {
+  if(soc >= SOC_BCM_2835 && soc <= SOC_BCM_21654) return SOC_VENDOR_BROADCOM;
+  else if(soc >= SOC_HISILICON_3620 && soc <= SOC_HISILICON_3690) return SOC_VENDOR_KIRIN;
+  else if(soc >= SOC_EXYNOS_3475 && soc <= SOC_EXYNOS_880) return SOC_VENDOR_EXYNOS;
+  else if(soc >= SOC_MTK_MT6873 && soc <= SOC_MTK_MT8783) return SOC_VENDOR_MEDIATEK;
+  else if(soc >= SOC_SNAPD_MSM7627A && soc <= SOC_SNAPD_SM8250_AB) return SOC_VENDOR_SNAPDRAGON;
+  return SOC_VENDOR_UNKNOWN;  
+}
+
+#endif
diff --git a/src/arm/socs_generation.sh b/src/arm/socs_generation.sh
new file mode 100755
index 0000000..27190c1
--- /dev/null
+++ b/src/arm/socs_generation.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+SOC_LIST="$(grep CHECK_SOC soc.c | grep -v '//' | grep -v 'define' | cut -d',' -f2 | sed 's/"//')"
+
+IFS=$'"'
+
+for soc in $SOC_LIST
+do
+  # CLEAN
+  soc=$(echo $soc | tr -d '\n')
+  soc="${soc:1}"
+  
+  # REPLACE
+  soc=$(echo $soc | sed "s/BCM/BCM_/g")
+  soc=$(echo $soc | sed "s/universal/EXYNOS_/g")
+  soc=$(echo $soc | sed "s/Hi/HISILICON_/g")
+  soc=$(echo $soc | sed "s/^MSM/SNAPD_MSM/g" | sed "s/SDM/SNAPD_SDM/g" | sed "s/APQ/SNAPD_APQ/g" | sed "s/^SM/SNAPD_SM/g" | sed "s/QM/SNAPD_QM/g" | sed "s/QSD/SNAPD_QSD/g")
+  soc=$(echo $soc | sed "s/MT/MTK_MT/g")
+  soc=$(echo $soc | sed "s/-/_/g" | sed "s/ /_/g")
+  echo '  SOC_'"$soc"','
+done
+
+unset IFS
diff --git a/src/common/printer.c b/src/common/printer.c
index 855ec53..945c547 100644
--- a/src/common/printer.c
+++ b/src/common/printer.c
@@ -177,35 +177,35 @@ struct ascii* set_ascii(VENDOR vendor, STYLE style, struct colors* cs) {
     return NULL;
   }
 #elif ARCH_ARM
-  if(art->vendor == SOC_SNAPDRAGON) {
+  if(art->vendor == SOC_VENDOR_SNAPDRAGON) {
     COL_FANCY_1 = COLOR_BG_RED;
     COL_FANCY_2 = COLOR_BG_WHITE;
     COL_FANCY_3 = COLOR_FG_RED;
     COL_FANCY_4 = COLOR_FG_WHITE;
     art->ascii_chars[0] = '@';
   }
-  else if(art->vendor == SOC_MEDIATEK) {
+  else if(art->vendor == SOC_VENDOR_MEDIATEK) {
     COL_FANCY_1 = COLOR_BG_BLUE;
     COL_FANCY_2 = COLOR_BG_YELLOW;
     COL_FANCY_3 = COLOR_FG_WHITE;
     COL_FANCY_4 = COLOR_FG_BLUE;
     art->ascii_chars[0] = '@';
   }
-  else if(art->vendor == SOC_EXYNOS) {
+  else if(art->vendor == SOC_VENDOR_EXYNOS) {
     COL_FANCY_1 = COLOR_BG_BLUE;
     COL_FANCY_2 = COLOR_BG_WHITE;
     COL_FANCY_3 = COLOR_FG_BLUE;
     COL_FANCY_4 = COLOR_FG_WHITE;
     art->ascii_chars[0] = '@';
   }
-  else if(art->vendor == SOC_KIRIN) {
+  else if(art->vendor == SOC_VENDOR_KIRIN) {
     COL_FANCY_1 = COLOR_BG_WHITE;
     COL_FANCY_2 = COLOR_BG_RED;
     COL_FANCY_3 = COLOR_FG_WHITE;
     COL_FANCY_4 = COLOR_FG_RED;
     art->ascii_chars[0] = '@';
   }
-  else if(art->vendor == SOC_BROADCOM) {
+  else if(art->vendor == SOC_VENDOR_BROADCOM) {
     COL_FANCY_1 = COLOR_BG_WHITE;
     COL_FANCY_2 = COLOR_BG_RED;
     COL_FANCY_3 = COLOR_FG_WHITE;
@@ -311,15 +311,15 @@ struct ascii* set_ascii(VENDOR vendor, STYLE style, struct colors* cs) {
   else
     strcpy(tmp, UNKNOWN_ASCII);  
 #elif ARCH_ARM  
-  if(art->vendor == SOC_SNAPDRAGON)
+  if(art->vendor == SOC_VENDOR_SNAPDRAGON)
     strcpy(tmp, SNAPDRAGON_ASCII);
-  else if(art->vendor == SOC_MEDIATEK)
+  else if(art->vendor == SOC_VENDOR_MEDIATEK)
     strcpy(tmp, MEDIATEK_ASCII);
-  else if(art->vendor == SOC_EXYNOS)
+  else if(art->vendor == SOC_VENDOR_EXYNOS)
     strcpy(tmp, EXYNOS_ASCII);
-  else if(art->vendor == SOC_KIRIN)
+  else if(art->vendor == SOC_VENDOR_KIRIN)
     strcpy(tmp, KIRIN_ASCII);
-  else if(art->vendor == SOC_BROADCOM)
+  else if(art->vendor == SOC_VENDOR_BROADCOM)
     strcpy(tmp, BROADCOM_ASCII);
   else
     strcpy(tmp, ARM_ASCII);
@@ -600,12 +600,12 @@ void print_ascii_arm(struct ascii* art, uint32_t la, void (*callback_print_algor
 void print_ascii(struct ascii* art) {
   uint32_t longest_attribute = longest_attribute_length(art);
   
-  if(art->vendor == SOC_SNAPDRAGON || art->vendor == SOC_MEDIATEK || art->vendor == SOC_KIRIN || art->vendor == SOC_BROADCOM)
+  if(art->vendor == SOC_VENDOR_SNAPDRAGON || art->vendor == SOC_VENDOR_MEDIATEK || art->vendor == SOC_VENDOR_KIRIN || art->vendor == SOC_VENDOR_BROADCOM)
     print_ascii_arm(art, longest_attribute, &print_algorithm_snapd_mtk);      
-  else if(art->vendor == SOC_EXYNOS)
+  else if(art->vendor == SOC_VENDOR_EXYNOS)
     print_ascii_arm(art, longest_attribute, &print_algorithm_samsung);      
   else {
-    if(art->vendor != SOC_UNKNOWN)
+    if(art->vendor != SOC_VENDOR_UNKNOWN)
       printWarn("Invalid SOC vendor: %d\n", art->vendor);
     print_ascii_arm(art, longest_attribute, &print_algorithm_arm);
   }