sonynwz: add nvp map for NW-A50 series

Change-Id: I49f3399552721e515cc01021c2e0aa28c781ec28

2 files changed, 191 insertions, 1 deletions

diff --git a/firmware/target/hosted/sonynwz/nwz-db.c b/firmware/target/hosted/sonynwz/nwz-db.c
index 9b98397524..dc4c23ca07 100644
--- a/firmware/target/hosted/sonynwz/nwz-db.c
+++ b/firmware/target/hosted/sonynwz/nwz-db.c
@@ -222,6 +222,8 @@ static int nvp_index_06a782[NWZ_NVP_COUNT] =
 {
     [NWZ_NVP_APD] = NWZ_NVP_INVALID,
     [NWZ_NVP_APP] = 0,
+    [NWZ_NVP_ATF] = NWZ_NVP_INVALID,
+    [NWZ_NVP_AWS] = NWZ_NVP_INVALID,
     [NWZ_NVP_BFD] = NWZ_NVP_INVALID,
     [NWZ_NVP_BFP] = NWZ_NVP_INVALID,
     [NWZ_NVP_BLF] = NWZ_NVP_INVALID,
@@ -242,6 +244,7 @@ static int nvp_index_06a782[NWZ_NVP_COUNT] =
     [NWZ_NVP_DCC] = 7,
     [NWZ_NVP_DG0] = 5,
     [NWZ_NVP_DG1] = 6,
+    [NWZ_NVP_DGS] = NWZ_NVP_INVALID,
     [NWZ_NVP_DOR] = 21,
     [NWZ_NVP_E00] = 36,
     [NWZ_NVP_E01] = 37,
@@ -321,6 +324,7 @@ static int nvp_index_06a782[NWZ_NVP_COUNT] =
     [NWZ_NVP_RTC] = 34,
     [NWZ_NVP_SDC] = NWZ_NVP_INVALID,
     [NWZ_NVP_SDP] = 30,
+    [NWZ_NVP_SE2] = NWZ_NVP_INVALID,
     [NWZ_NVP_SER] = 4,
     [NWZ_NVP_SFI] = NWZ_NVP_INVALID,
     [NWZ_NVP_SHE] = NWZ_NVP_INVALID,
@@ -331,6 +335,7 @@ static int nvp_index_06a782[NWZ_NVP_COUNT] =
     [NWZ_NVP_SKU] = NWZ_NVP_INVALID,
     [NWZ_NVP_SLP] = 69,
     [NWZ_NVP_SPS] = NWZ_NVP_INVALID,
+    [NWZ_NVP_SSK] = NWZ_NVP_INVALID,
     [NWZ_NVP_SYI] = 24,
     [NWZ_NVP_TR0] = 14,
     [NWZ_NVP_TR1] = 15,
@@ -347,6 +352,8 @@ static int nvp_index_0ac81d[NWZ_NVP_COUNT] =
 {
     [NWZ_NVP_APD] = 78,
     [NWZ_NVP_APP] = 5,
+    [NWZ_NVP_ATF] = NWZ_NVP_INVALID,
+    [NWZ_NVP_AWS] = NWZ_NVP_INVALID,
     [NWZ_NVP_BFD] = NWZ_NVP_INVALID,
     [NWZ_NVP_BFP] = NWZ_NVP_INVALID,
     [NWZ_NVP_BLF] = 79,
@@ -367,6 +374,7 @@ static int nvp_index_0ac81d[NWZ_NVP_COUNT] =
     [NWZ_NVP_DCC] = 7,
     [NWZ_NVP_DG0] = NWZ_NVP_INVALID,
     [NWZ_NVP_DG1] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DGS] = NWZ_NVP_INVALID,
     [NWZ_NVP_DOR] = 21,
     [NWZ_NVP_E00] = 36,
     [NWZ_NVP_E01] = 37,
@@ -446,6 +454,7 @@ static int nvp_index_0ac81d[NWZ_NVP_COUNT] =
     [NWZ_NVP_RTC] = 34,
     [NWZ_NVP_SDC] = NWZ_NVP_INVALID,
     [NWZ_NVP_SDP] = 30,
+    [NWZ_NVP_SE2] = NWZ_NVP_INVALID,
     [NWZ_NVP_SER] = 4,
     [NWZ_NVP_SFI] = NWZ_NVP_INVALID,
     [NWZ_NVP_SHE] = NWZ_NVP_INVALID,
@@ -456,6 +465,7 @@ static int nvp_index_0ac81d[NWZ_NVP_COUNT] =
     [NWZ_NVP_SKU] = NWZ_NVP_INVALID,
     [NWZ_NVP_SLP] = 69,
     [NWZ_NVP_SPS] = 83,
+    [NWZ_NVP_SSK] = NWZ_NVP_INVALID,
     [NWZ_NVP_SYI] = 24,
     [NWZ_NVP_TR0] = 14,
     [NWZ_NVP_TR1] = 15,
@@ -472,6 +482,8 @@ static int nvp_index_139d65[NWZ_NVP_COUNT] =
 {
     [NWZ_NVP_APD] = 78,
     [NWZ_NVP_APP] = NWZ_NVP_INVALID,
+    [NWZ_NVP_ATF] = NWZ_NVP_INVALID,
+    [NWZ_NVP_AWS] = NWZ_NVP_INVALID,
     [NWZ_NVP_BFD] = 21,
     [NWZ_NVP_BFP] = 20,
     [NWZ_NVP_BLF] = 79,
@@ -492,6 +504,7 @@ static int nvp_index_139d65[NWZ_NVP_COUNT] =
     [NWZ_NVP_DCC] = NWZ_NVP_INVALID,
     [NWZ_NVP_DG0] = NWZ_NVP_INVALID,
     [NWZ_NVP_DG1] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DGS] = NWZ_NVP_INVALID,
     [NWZ_NVP_DOR] = NWZ_NVP_INVALID,
     [NWZ_NVP_E00] = 36,
     [NWZ_NVP_E01] = 37,
@@ -571,6 +584,7 @@ static int nvp_index_139d65[NWZ_NVP_COUNT] =
     [NWZ_NVP_RTC] = NWZ_NVP_INVALID,
     [NWZ_NVP_SDC] = NWZ_NVP_INVALID,
     [NWZ_NVP_SDP] = 16,
+    [NWZ_NVP_SE2] = NWZ_NVP_INVALID,
     [NWZ_NVP_SER] = 9,
     [NWZ_NVP_SFI] = NWZ_NVP_INVALID,
     [NWZ_NVP_SHE] = 84,
@@ -581,6 +595,7 @@ static int nvp_index_139d65[NWZ_NVP_COUNT] =
     [NWZ_NVP_SKU] = 91,
     [NWZ_NVP_SLP] = 80,
     [NWZ_NVP_SPS] = 69,
+    [NWZ_NVP_SSK] = NWZ_NVP_INVALID,
     [NWZ_NVP_SYI] = 1,
     [NWZ_NVP_TR0] = 34,
     [NWZ_NVP_TR1] = 35,
@@ -597,6 +612,8 @@ static int nvp_index_28dc2c[NWZ_NVP_COUNT] =
 {
     [NWZ_NVP_APD] = 78,
     [NWZ_NVP_APP] = NWZ_NVP_INVALID,
+    [NWZ_NVP_ATF] = NWZ_NVP_INVALID,
+    [NWZ_NVP_AWS] = NWZ_NVP_INVALID,
     [NWZ_NVP_BFD] = 21,
     [NWZ_NVP_BFP] = 20,
     [NWZ_NVP_BLF] = 79,
@@ -617,6 +634,7 @@ static int nvp_index_28dc2c[NWZ_NVP_COUNT] =
     [NWZ_NVP_DCC] = 31,
     [NWZ_NVP_DG0] = NWZ_NVP_INVALID,
     [NWZ_NVP_DG1] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DGS] = NWZ_NVP_INVALID,
     [NWZ_NVP_DOR] = 26,
     [NWZ_NVP_E00] = 36,
     [NWZ_NVP_E01] = 37,
@@ -696,6 +714,7 @@ static int nvp_index_28dc2c[NWZ_NVP_COUNT] =
     [NWZ_NVP_RTC] = 6,
     [NWZ_NVP_SDC] = NWZ_NVP_INVALID,
     [NWZ_NVP_SDP] = 16,
+    [NWZ_NVP_SE2] = NWZ_NVP_INVALID,
     [NWZ_NVP_SER] = 9,
     [NWZ_NVP_SFI] = 29,
     [NWZ_NVP_SHE] = NWZ_NVP_INVALID,
@@ -706,6 +725,7 @@ static int nvp_index_28dc2c[NWZ_NVP_COUNT] =
     [NWZ_NVP_SKU] = NWZ_NVP_INVALID,
     [NWZ_NVP_SLP] = 80,
     [NWZ_NVP_SPS] = 69,
+    [NWZ_NVP_SSK] = NWZ_NVP_INVALID,
     [NWZ_NVP_SYI] = 1,
     [NWZ_NVP_TR0] = 34,
     [NWZ_NVP_TR1] = 35,
@@ -722,6 +742,8 @@ static int nvp_index_342a18[NWZ_NVP_COUNT] =
 {
     [NWZ_NVP_APD] = NWZ_NVP_INVALID,
     [NWZ_NVP_APP] = 0,
+    [NWZ_NVP_ATF] = NWZ_NVP_INVALID,
+    [NWZ_NVP_AWS] = NWZ_NVP_INVALID,
     [NWZ_NVP_BFD] = NWZ_NVP_INVALID,
     [NWZ_NVP_BFP] = NWZ_NVP_INVALID,
     [NWZ_NVP_BLF] = NWZ_NVP_INVALID,
@@ -742,6 +764,7 @@ static int nvp_index_342a18[NWZ_NVP_COUNT] =
     [NWZ_NVP_DCC] = 7,
     [NWZ_NVP_DG0] = 5,
     [NWZ_NVP_DG1] = 6,
+    [NWZ_NVP_DGS] = NWZ_NVP_INVALID,
     [NWZ_NVP_DOR] = 21,
     [NWZ_NVP_E00] = NWZ_NVP_INVALID,
     [NWZ_NVP_E01] = NWZ_NVP_INVALID,
@@ -821,6 +844,7 @@ static int nvp_index_342a18[NWZ_NVP_COUNT] =
     [NWZ_NVP_RTC] = 34,
     [NWZ_NVP_SDC] = NWZ_NVP_INVALID,
     [NWZ_NVP_SDP] = 30,
+    [NWZ_NVP_SE2] = NWZ_NVP_INVALID,
     [NWZ_NVP_SER] = 4,
     [NWZ_NVP_SFI] = NWZ_NVP_INVALID,
     [NWZ_NVP_SHE] = NWZ_NVP_INVALID,
@@ -831,6 +855,7 @@ static int nvp_index_342a18[NWZ_NVP_COUNT] =
     [NWZ_NVP_SKU] = NWZ_NVP_INVALID,
     [NWZ_NVP_SLP] = NWZ_NVP_INVALID,
     [NWZ_NVP_SPS] = NWZ_NVP_INVALID,
+    [NWZ_NVP_SSK] = NWZ_NVP_INVALID,
     [NWZ_NVP_SYI] = 24,
     [NWZ_NVP_TR0] = 14,
     [NWZ_NVP_TR1] = 15,
@@ -847,6 +872,8 @@ static int nvp_index_398250[NWZ_NVP_COUNT] =
 {
     [NWZ_NVP_APD] = 78,
     [NWZ_NVP_APP] = NWZ_NVP_INVALID,
+    [NWZ_NVP_ATF] = NWZ_NVP_INVALID,
+    [NWZ_NVP_AWS] = NWZ_NVP_INVALID,
     [NWZ_NVP_BFD] = 21,
     [NWZ_NVP_BFP] = 20,
     [NWZ_NVP_BLF] = 79,
@@ -867,6 +894,7 @@ static int nvp_index_398250[NWZ_NVP_COUNT] =
     [NWZ_NVP_DCC] = NWZ_NVP_INVALID,
     [NWZ_NVP_DG0] = NWZ_NVP_INVALID,
     [NWZ_NVP_DG1] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DGS] = NWZ_NVP_INVALID,
     [NWZ_NVP_DOR] = NWZ_NVP_INVALID,
     [NWZ_NVP_E00] = 36,
     [NWZ_NVP_E01] = 37,
@@ -946,6 +974,7 @@ static int nvp_index_398250[NWZ_NVP_COUNT] =
     [NWZ_NVP_RTC] = 6,
     [NWZ_NVP_SDC] = NWZ_NVP_INVALID,
     [NWZ_NVP_SDP] = 16,
+    [NWZ_NVP_SE2] = NWZ_NVP_INVALID,
     [NWZ_NVP_SER] = 9,
     [NWZ_NVP_SFI] = NWZ_NVP_INVALID,
     [NWZ_NVP_SHE] = 84,
@@ -956,6 +985,7 @@ static int nvp_index_398250[NWZ_NVP_COUNT] =
     [NWZ_NVP_SKU] = 91,
     [NWZ_NVP_SLP] = 80,
     [NWZ_NVP_SPS] = 69,
+    [NWZ_NVP_SSK] = NWZ_NVP_INVALID,
     [NWZ_NVP_SYI] = 1,
     [NWZ_NVP_TR0] = 34,
     [NWZ_NVP_TR1] = 35,
@@ -972,6 +1002,8 @@ static int nvp_index_4edba7[NWZ_NVP_COUNT] =
 {
     [NWZ_NVP_APD] = 78,
     [NWZ_NVP_APP] = 0,
+    [NWZ_NVP_ATF] = NWZ_NVP_INVALID,
+    [NWZ_NVP_AWS] = NWZ_NVP_INVALID,
     [NWZ_NVP_BFD] = NWZ_NVP_INVALID,
     [NWZ_NVP_BFP] = NWZ_NVP_INVALID,
     [NWZ_NVP_BLF] = 79,
@@ -992,6 +1024,7 @@ static int nvp_index_4edba7[NWZ_NVP_COUNT] =
     [NWZ_NVP_DCC] = 7,
     [NWZ_NVP_DG0] = 5,
     [NWZ_NVP_DG1] = 6,
+    [NWZ_NVP_DGS] = NWZ_NVP_INVALID,
     [NWZ_NVP_DOR] = 21,
     [NWZ_NVP_E00] = 36,
     [NWZ_NVP_E01] = 37,
@@ -1071,6 +1104,7 @@ static int nvp_index_4edba7[NWZ_NVP_COUNT] =
     [NWZ_NVP_RTC] = 34,
     [NWZ_NVP_SDC] = NWZ_NVP_INVALID,
     [NWZ_NVP_SDP] = 30,
+    [NWZ_NVP_SE2] = NWZ_NVP_INVALID,
     [NWZ_NVP_SER] = 4,
     [NWZ_NVP_SFI] = NWZ_NVP_INVALID,
     [NWZ_NVP_SHE] = NWZ_NVP_INVALID,
@@ -1081,6 +1115,7 @@ static int nvp_index_4edba7[NWZ_NVP_COUNT] =
     [NWZ_NVP_SKU] = NWZ_NVP_INVALID,
     [NWZ_NVP_SLP] = 69,
     [NWZ_NVP_SPS] = NWZ_NVP_INVALID,
+    [NWZ_NVP_SSK] = NWZ_NVP_INVALID,
     [NWZ_NVP_SYI] = 24,
     [NWZ_NVP_TR0] = 14,
     [NWZ_NVP_TR1] = 15,
@@ -1097,6 +1132,8 @@ static int nvp_index_6485c8[NWZ_NVP_COUNT] =
 {
     [NWZ_NVP_APD] = 78,
     [NWZ_NVP_APP] = NWZ_NVP_INVALID,
+    [NWZ_NVP_ATF] = NWZ_NVP_INVALID,
+    [NWZ_NVP_AWS] = NWZ_NVP_INVALID,
     [NWZ_NVP_BFD] = 21,
     [NWZ_NVP_BFP] = 20,
     [NWZ_NVP_BLF] = 79,
@@ -1117,6 +1154,7 @@ static int nvp_index_6485c8[NWZ_NVP_COUNT] =
     [NWZ_NVP_DCC] = 31,
     [NWZ_NVP_DG0] = NWZ_NVP_INVALID,
     [NWZ_NVP_DG1] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DGS] = NWZ_NVP_INVALID,
     [NWZ_NVP_DOR] = 26,
     [NWZ_NVP_E00] = 36,
     [NWZ_NVP_E01] = 37,
@@ -1196,6 +1234,7 @@ static int nvp_index_6485c8[NWZ_NVP_COUNT] =
     [NWZ_NVP_RTC] = 6,
     [NWZ_NVP_SDC] = NWZ_NVP_INVALID,
     [NWZ_NVP_SDP] = 16,
+    [NWZ_NVP_SE2] = NWZ_NVP_INVALID,
     [NWZ_NVP_SER] = 9,
     [NWZ_NVP_SFI] = 29,
     [NWZ_NVP_SHE] = NWZ_NVP_INVALID,
@@ -1206,6 +1245,7 @@ static int nvp_index_6485c8[NWZ_NVP_COUNT] =
     [NWZ_NVP_SKU] = NWZ_NVP_INVALID,
     [NWZ_NVP_SLP] = 80,
     [NWZ_NVP_SPS] = 69,
+    [NWZ_NVP_SSK] = NWZ_NVP_INVALID,
     [NWZ_NVP_SYI] = 1,
     [NWZ_NVP_TR0] = 34,
     [NWZ_NVP_TR1] = 35,
@@ -1222,6 +1262,8 @@ static int nvp_index_92faee[NWZ_NVP_COUNT] =
 {
     [NWZ_NVP_APD] = 78,
     [NWZ_NVP_APP] = NWZ_NVP_INVALID,
+    [NWZ_NVP_ATF] = NWZ_NVP_INVALID,
+    [NWZ_NVP_AWS] = NWZ_NVP_INVALID,
     [NWZ_NVP_BFD] = 21,
     [NWZ_NVP_BFP] = 20,
     [NWZ_NVP_BLF] = 79,
@@ -1242,6 +1284,7 @@ static int nvp_index_92faee[NWZ_NVP_COUNT] =
     [NWZ_NVP_DCC] = 31,
     [NWZ_NVP_DG0] = NWZ_NVP_INVALID,
     [NWZ_NVP_DG1] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DGS] = NWZ_NVP_INVALID,
     [NWZ_NVP_DOR] = 26,
     [NWZ_NVP_E00] = 36,
     [NWZ_NVP_E01] = 37,
@@ -1321,6 +1364,7 @@ static int nvp_index_92faee[NWZ_NVP_COUNT] =
     [NWZ_NVP_RTC] = 6,
     [NWZ_NVP_SDC] = 89,
     [NWZ_NVP_SDP] = 16,
+    [NWZ_NVP_SE2] = NWZ_NVP_INVALID,
     [NWZ_NVP_SER] = 9,
     [NWZ_NVP_SFI] = 29,
     [NWZ_NVP_SHE] = NWZ_NVP_INVALID,
@@ -1331,6 +1375,7 @@ static int nvp_index_92faee[NWZ_NVP_COUNT] =
     [NWZ_NVP_SKU] = NWZ_NVP_INVALID,
     [NWZ_NVP_SLP] = 80,
     [NWZ_NVP_SPS] = 69,
+    [NWZ_NVP_SSK] = NWZ_NVP_INVALID,
     [NWZ_NVP_SYI] = 1,
     [NWZ_NVP_TR0] = 34,
     [NWZ_NVP_TR1] = 35,
@@ -1343,10 +1388,142 @@ static int nvp_index_92faee[NWZ_NVP_COUNT] =
     [NWZ_NVP_VRT] = 81,
 };
 
+static int nvp_index_94b5fc[NWZ_NVP_COUNT] =
+{
+    [NWZ_NVP_APD] = 78,
+    [NWZ_NVP_APP] = NWZ_NVP_INVALID,
+    [NWZ_NVP_ATF] = 23,
+    [NWZ_NVP_AWS] = 30,
+    [NWZ_NVP_BFD] = 21,
+    [NWZ_NVP_BFP] = 20,
+    [NWZ_NVP_BLF] = 79,
+    [NWZ_NVP_BML] = 22,
+    [NWZ_NVP_BOK] = NWZ_NVP_INVALID,
+    [NWZ_NVP_BPR] = 19,
+    [NWZ_NVP_BTC] = 85,
+    [NWZ_NVP_BTI] = 72,
+    [NWZ_NVP_CLG] = 15,
+    [NWZ_NVP_CLV] = 68,
+    [NWZ_NVP_CNG] = NWZ_NVP_INVALID,
+    [NWZ_NVP_CTR] = 90,
+    [NWZ_NVP_DBA] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DBG] = 0,
+    [NWZ_NVP_DBI] = 88,
+    [NWZ_NVP_DBS] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DBV] = 25,
+    [NWZ_NVP_DCC] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DG0] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DG1] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DGS] = 92,
+    [NWZ_NVP_DOR] = NWZ_NVP_INVALID,
+    [NWZ_NVP_E00] = 36,
+    [NWZ_NVP_E01] = 37,
+    [NWZ_NVP_E02] = 38,
+    [NWZ_NVP_E03] = 39,
+    [NWZ_NVP_E04] = 40,
+    [NWZ_NVP_E05] = 41,
+    [NWZ_NVP_E06] = 42,
+    [NWZ_NVP_E07] = 43,
+    [NWZ_NVP_E08] = 44,
+    [NWZ_NVP_E09] = 45,
+    [NWZ_NVP_E10] = 46,
+    [NWZ_NVP_E11] = 47,
+    [NWZ_NVP_E12] = 48,
+    [NWZ_NVP_E13] = 49,
+    [NWZ_NVP_E14] = 50,
+    [NWZ_NVP_E15] = 51,
+    [NWZ_NVP_E16] = 52,
+    [NWZ_NVP_E17] = 53,
+    [NWZ_NVP_E18] = 54,
+    [NWZ_NVP_E19] = 55,
+    [NWZ_NVP_E20] = 56,
+    [NWZ_NVP_E21] = 57,
+    [NWZ_NVP_E22] = 58,
+    [NWZ_NVP_E23] = 59,
+    [NWZ_NVP_E24] = 60,
+    [NWZ_NVP_E25] = 61,
+    [NWZ_NVP_E26] = 62,
+    [NWZ_NVP_E27] = 63,
+    [NWZ_NVP_E28] = 64,
+    [NWZ_NVP_E29] = 65,
+    [NWZ_NVP_E30] = 66,
+    [NWZ_NVP_E31] = 67,
+    [NWZ_NVP_EDW] = 71,
+    [NWZ_NVP_EP0] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EP1] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EP2] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EP3] = NWZ_NVP_INVALID,
+    [NWZ_NVP_ERI] = 76,
+    [NWZ_NVP_EXM] = NWZ_NVP_INVALID,
+    [NWZ_NVP_FMP] = NWZ_NVP_INVALID,
+    [NWZ_NVP_FNI] = 82,
+    [NWZ_NVP_FPI] = 33,
+    [NWZ_NVP_FUI] = 75,
+    [NWZ_NVP_FUP] = 3,
+    [NWZ_NVP_FUR] = 26,
+    [NWZ_NVP_FVI] = 31,
+    [NWZ_NVP_GTY] = 14,
+    [NWZ_NVP_HDI] = 73,
+    [NWZ_NVP_HLD] = 5,
+    [NWZ_NVP_INS] = 89,
+    [NWZ_NVP_IPT] = NWZ_NVP_INVALID,
+    [NWZ_NVP_KAS] = 11,
+    [NWZ_NVP_LBI] = 74,
+    [NWZ_NVP_LYR] = 24,
+    [NWZ_NVP_MAC] = 32,
+    [NWZ_NVP_MCR] = NWZ_NVP_INVALID,
+    [NWZ_NVP_MDK] = NWZ_NVP_INVALID,
+    [NWZ_NVP_MDL] = NWZ_NVP_INVALID,
+    [NWZ_NVP_MID] = 7,
+    [NWZ_NVP_MLK] = NWZ_NVP_INVALID,
+    [NWZ_NVP_MSC] = NWZ_NVP_INVALID,
+    [NWZ_NVP_MSO] = 86,
+    [NWZ_NVP_MTM] = NWZ_NVP_INVALID,
+    [NWZ_NVP_MUK] = NWZ_NVP_INVALID,
+    [NWZ_NVP_NCP] = 17,
+    [NWZ_NVP_NVR] = 77,
+    [NWZ_NVP_PCD] = 8,
+    [NWZ_NVP_PCI] = 87,
+    [NWZ_NVP_PNC] = NWZ_NVP_INVALID,
+    [NWZ_NVP_PRK] = 4,
+    [NWZ_NVP_PSK] = 18,
+    [NWZ_NVP_PTS] = NWZ_NVP_INVALID,
+    [NWZ_NVP_PWD] = 6,
+    [NWZ_NVP_RBT] = 70,
+    [NWZ_NVP_RND] = NWZ_NVP_INVALID,
+    [NWZ_NVP_RTC] = NWZ_NVP_INVALID,
+    [NWZ_NVP_SDC] = NWZ_NVP_INVALID,
+    [NWZ_NVP_SDP] = NWZ_NVP_INVALID,
+    [NWZ_NVP_SE2] = 16,
+    [NWZ_NVP_SER] = 9,
+    [NWZ_NVP_SFI] = NWZ_NVP_INVALID,
+    [NWZ_NVP_SHE] = 84,
+    [NWZ_NVP_SHP] = 12,
+    [NWZ_NVP_SID] = 83,
+    [NWZ_NVP_SKD] = 28,
+    [NWZ_NVP_SKT] = NWZ_NVP_INVALID,
+    [NWZ_NVP_SKU] = 91,
+    [NWZ_NVP_SLP] = 80,
+    [NWZ_NVP_SPS] = 69,
+    [NWZ_NVP_SSK] = 34,
+    [NWZ_NVP_SYI] = 1,
+    [NWZ_NVP_TR0] = NWZ_NVP_INVALID,
+    [NWZ_NVP_TR1] = 35,
+    [NWZ_NVP_TST] = 13,
+    [NWZ_NVP_UBP] = 2,
+    [NWZ_NVP_UFN] = 10,
+    [NWZ_NVP_UMS] = 27,
+    [NWZ_NVP_UPS] = 29,
+    [NWZ_NVP_VAR] = NWZ_NVP_INVALID,
+    [NWZ_NVP_VRT] = 81,
+};
+
 static int nvp_index_f505c8[NWZ_NVP_COUNT] =
 {
     [NWZ_NVP_APD] = 78,
     [NWZ_NVP_APP] = 5,
+    [NWZ_NVP_ATF] = NWZ_NVP_INVALID,
+    [NWZ_NVP_AWS] = NWZ_NVP_INVALID,
     [NWZ_NVP_BFD] = 88,
     [NWZ_NVP_BFP] = 89,
     [NWZ_NVP_BLF] = 79,
@@ -1367,6 +1544,7 @@ static int nvp_index_f505c8[NWZ_NVP_COUNT] =
     [NWZ_NVP_DCC] = 7,
     [NWZ_NVP_DG0] = NWZ_NVP_INVALID,
     [NWZ_NVP_DG1] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DGS] = NWZ_NVP_INVALID,
     [NWZ_NVP_DOR] = 21,
     [NWZ_NVP_E00] = 36,
     [NWZ_NVP_E01] = 37,
@@ -1446,6 +1624,7 @@ static int nvp_index_f505c8[NWZ_NVP_COUNT] =
     [NWZ_NVP_RTC] = 34,
     [NWZ_NVP_SDC] = NWZ_NVP_INVALID,
     [NWZ_NVP_SDP] = 30,
+    [NWZ_NVP_SE2] = NWZ_NVP_INVALID,
     [NWZ_NVP_SER] = 4,
     [NWZ_NVP_SFI] = 33,
     [NWZ_NVP_SHE] = NWZ_NVP_INVALID,
@@ -1456,6 +1635,7 @@ static int nvp_index_f505c8[NWZ_NVP_COUNT] =
     [NWZ_NVP_SKU] = NWZ_NVP_INVALID,
     [NWZ_NVP_SLP] = 69,
     [NWZ_NVP_SPS] = 83,
+    [NWZ_NVP_SSK] = NWZ_NVP_INVALID,
     [NWZ_NVP_SYI] = 24,
     [NWZ_NVP_TR0] = 14,
     [NWZ_NVP_TR1] = 15,
@@ -1472,6 +1652,8 @@ struct nwz_nvp_info_t nwz_nvp[NWZ_NVP_COUNT] =
 {
     [NWZ_NVP_APD] = { "apd", 4, "application debug mode flag" },
     [NWZ_NVP_APP] = { "app", 4096, "application parameter" },
+    [NWZ_NVP_ATF] = { "atf", 0, "" },
+    [NWZ_NVP_AWS] = { "aws", 0, "" },
     [NWZ_NVP_BFD] = { "bfd", 512, "btmw factory scdb" },
     [NWZ_NVP_BFP] = { "bfp", 512, "btmw factory pair info" },
     [NWZ_NVP_BLF] = { "blf", 4, "browser log mode flag" },
@@ -1492,6 +1674,7 @@ struct nwz_nvp_info_t nwz_nvp[NWZ_NVP_COUNT] =
     [NWZ_NVP_DCC] = { "dcc", 20, "secure clock" },
     [NWZ_NVP_DG0] = { "dg0", 0, "" },
     [NWZ_NVP_DG1] = { "dg1", 0, "" },
+    [NWZ_NVP_DGS] = { "dgs", 0, "" },
     [NWZ_NVP_DOR] = { "dor", 4, "key mode (debug/release)" },
     [NWZ_NVP_E00] = { "e00", 1024, "EMPR  0" },
     [NWZ_NVP_E01] = { "e01", 1024, "EMPR  1" },
@@ -1571,6 +1754,7 @@ struct nwz_nvp_info_t nwz_nvp[NWZ_NVP_COUNT] =
     [NWZ_NVP_RTC] = { "rtc", 16, "rtc alarm" },
     [NWZ_NVP_SDC] = { "sdc", 4, "SD Card export flag" },
     [NWZ_NVP_SDP] = { "sdp", 64, "sound driver parameter" },
+    [NWZ_NVP_SE2] = { "se2", 0, "" },
     [NWZ_NVP_SER] = { "ser", 16, "serial number" },
     [NWZ_NVP_SFI] = { "sfi", 64, "starfish id" },
     [NWZ_NVP_SHE] = { "she", 0, "" },
@@ -1581,6 +1765,7 @@ struct nwz_nvp_info_t nwz_nvp[NWZ_NVP_COUNT] =
     [NWZ_NVP_SKU] = { "sku", 0, "" },
     [NWZ_NVP_SLP] = { "slp", 4, "time out to sleep" },
     [NWZ_NVP_SPS] = { "sps", 4, "speaker ship info" },
+    [NWZ_NVP_SSK] = { "ssk", 0, "" },
     [NWZ_NVP_SYI] = { "syi", 4, "system information" },
     [NWZ_NVP_TR0] = { "tr0", 16384, "EKB 0" },
     [NWZ_NVP_TR1] = { "tr1", 16384, "EKB 1" },
@@ -1705,7 +1890,7 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] =
     { "nw-a20", "NW-A20 Series", 6, models_nw_a20, &nvp_index_92faee },
     { "nw-a30", "NW-A30 Series", 3, models_nw_a30, &nvp_index_398250 },
     { "nw-a40", "NW-A40 Series", 3, models_nw_a40, &nvp_index_139d65 },
-    { "nw-a50", "NW-A50 Series", 1, models_nw_a50, 0 },
+    { "nw-a50", "NW-A50 Series", 1, models_nw_a50, &nvp_index_94b5fc },
     { "nwz-a720", "NWZ-A720 Series", 6, models_nwz_a720, 0 },
     { "nwz-a810", "NWZ-A810 Series", 3, models_nwz_a810, &nvp_index_342a18 },
     { "nwz-a820", "NWZ-A820 Series", 6, models_nwz_a820, 0 },
diff --git a/firmware/target/hosted/sonynwz/nwz-db.h b/firmware/target/hosted/sonynwz/nwz-db.h
index c17f7fd961..1fe383b715 100644
--- a/firmware/target/hosted/sonynwz/nwz-db.h
+++ b/firmware/target/hosted/sonynwz/nwz-db.h
@@ -27,6 +27,8 @@ enum nwz_nvp_node_t
 {
     NWZ_NVP_APD, /* application debug mode flag */
     NWZ_NVP_APP, /* application parameter */
+    NWZ_NVP_ATF, /*  */
+    NWZ_NVP_AWS, /*  */
     NWZ_NVP_BFD, /* btmw factory scdb */
     NWZ_NVP_BFP, /* btmw factory pair info */
     NWZ_NVP_BLF, /* browser log mode flag */
@@ -47,6 +49,7 @@ enum nwz_nvp_node_t
     NWZ_NVP_DCC, /* secure clock */
     NWZ_NVP_DG0, /*  */
     NWZ_NVP_DG1, /*  */
+    NWZ_NVP_DGS, /*  */
     NWZ_NVP_DOR, /* key mode (debug/release) */
     NWZ_NVP_E00, /* EMPR  0 */
     NWZ_NVP_E01, /* EMPR  1 */
@@ -126,6 +129,7 @@ enum nwz_nvp_node_t
     NWZ_NVP_RTC, /* rtc alarm */
     NWZ_NVP_SDC, /* SD Card export flag */
     NWZ_NVP_SDP, /* sound driver parameter */
+    NWZ_NVP_SE2, /*  */
     NWZ_NVP_SER, /* serial number */
     NWZ_NVP_SFI, /* starfish id */
     NWZ_NVP_SHE, /*  */
@@ -136,6 +140,7 @@ enum nwz_nvp_node_t
     NWZ_NVP_SKU, /*  */
     NWZ_NVP_SLP, /* time out to sleep */
     NWZ_NVP_SPS, /* speaker ship info */
+    NWZ_NVP_SSK, /*  */
     NWZ_NVP_SYI, /* system information */
     NWZ_NVP_TR0, /* EKB 0 */
     NWZ_NVP_TR1, /* EKB 1 */