4 files changed, 8 insertions, 4 deletions

diff --git a/utils/nwztools/database/models.txt b/utils/nwztools/database/models.txt
index 447b043bb1..cd9f547f2d 100644
--- a/utils/nwztools/database/models.txt
+++ b/utils/nwztools/database/models.txt
@@ -182,3 +182,5 @@
 0x20000007,NW-WM1A
 0x21000008,NW-WM1Z
 0x22000004,NW-A35
+0x22000005,NW-A36
+0x22000006,NW-A37
diff --git a/utils/nwztools/database/nwz_db.c b/utils/nwztools/database/nwz_db.c
index e77b86e729..ba1a64ac5a 100644
--- a/utils/nwztools/database/nwz_db.c
+++ b/utils/nwztools/database/nwz_db.c
@@ -208,6 +208,8 @@ struct nwz_model_info_t nwz_model[NWZ_MODEL_COUNT] =
     { 0x20000007, "NW-WM1A" },
     { 0x21000008, "NW-WM1Z" },
     { 0x22000004, "NW-A35" },
+    { 0x22000005, "NW-A36" },
+    { 0x22000006, "NW-A37" },
 };
 
 static int nvp_index_0ac81d[NWZ_NVP_COUNT] =
@@ -1201,7 +1203,7 @@ static unsigned long models_nwz_a10[] = { 0x1a000001, 0x1a000002, 0x1a000004,
 static unsigned long models_nw_a20[] = { 0x1d000001, 0x1d000002, 0x1d000004,
     0x1d000005, 0x1d000006, 0x1d000007 };
 
-static unsigned long models_nw_a30[] = { 0x22000004 };
+static unsigned long models_nw_a30[] = { 0x22000004, 0x22000005, 0x22000006 };
 
 static unsigned long models_nwz_a720[] = { 0x3030001, 0x3030002, 0x3030004,
     0x3020001, 0x3020002, 0x3020004 };
@@ -1298,7 +1300,7 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] =
 {
     { "nwz-a10", "NWZ-A10 Series", 10, models_nwz_a10, &nvp_index_92faee },
     { "nw-a20", "NW-A20 Series", 6, models_nw_a20, &nvp_index_92faee },
-    { "nw-a30", "NW-A30 Series", 1, models_nw_a30, &nvp_index_398250 },
+    { "nw-a30", "NW-A30 Series", 3, models_nw_a30, &nvp_index_398250 },
     { "nwz-a720", "NWZ-A720 Series", 6, models_nwz_a720, 0 },
     { "nwz-a810", "NWZ-A810 Series", 3, models_nwz_a810, 0 },
     { "nwz-a820", "NWZ-A820 Series", 6, models_nwz_a820, 0 },
diff --git a/utils/nwztools/database/nwz_db.h b/utils/nwztools/database/nwz_db.h
index 2e05dd0968..cb130f96a2 100644
--- a/utils/nwztools/database/nwz_db.h
+++ b/utils/nwztools/database/nwz_db.h
@@ -150,7 +150,7 @@ enum nwz_nvp_node_t
 /* Invalid NVP index */
 #define NWZ_NVP_INVALID     -1 /* Non-existent entry */
 /* Number of models */
-#define NWZ_MODEL_COUNT     184
+#define NWZ_MODEL_COUNT     186
 /* Number of series */
 #define NWZ_SERIES_COUNT    36
 
diff --git a/utils/nwztools/database/series.txt b/utils/nwztools/database/series.txt
index bba140323b..2128ad2abb 100644
--- a/utils/nwztools/database/series.txt
+++ b/utils/nwztools/database/series.txt
@@ -1,6 +1,6 @@
 nwz-a10,NWZ-A10 Series,0x1a000001,0x1a000002,0x1a000004,0x1a000005,0x1a000006,0x1a010001,0x1a010002,0x1a010004,0x1a010005,0x1a010006
 nw-a20,NW-A20 Series,0x1d000001,0x1d000002,0x1d000004,0x1d000005,0x1d000006,0x1d000007
-nw-a30,NW-A30 Series,0x22000004
+nw-a30,NW-A30 Series,0x22000004,0x22000005,0x22000006
 nwz-a720,NWZ-A720 Series,0x3030001,0x3030002,0x3030004,0x3020001,0x3020002,0x3020004
 nwz-a810,NWZ-A810 Series,0x10000,0x10001,0x10002
 nwz-a820,NWZ-A820 Series,0x3010001,0x3010002,0x3010004,0x3000001,0x3000002,0x3000004