qcacmn: Update Japan regulatory domains

Change Tx Power for 2G regdomains MKKA and MKKC to 23 dBm.
Also change TX power for 5G regdomain sub-bands for MKK5 and
MKK11.

Change-Id: I32337fea35f350b2171b6d0a242934f0668d4f5e
CRs-Fixed: 2229597

umac/regulatory/core/src/reg_db.c

@@ -763,6 +763,7 @@ enum reg_rules_2g {
 	CHAN_1_13_1,
 	CHAN_1_13_2,
 	CHAN_1_13_3,
+	CHAN_1_13_4,
 	CHAN_12_13_1,
 	CHAN_14_1,
 	CHAN_14_2,
@@ -776,8 +777,9 @@ const struct regulatory_rule reg_rules_2g[] = {
 	[CHAN_1_13_1] = {2402, 2482, 40, 20, 0},
 	[CHAN_1_13_2] = {2402, 2482, 40, 30, 0},
 	[CHAN_1_13_3] = {2402, 2482, 40, 36, 0},
+	[CHAN_1_13_4] = {2402, 2482, 40, 23, 0},
 	[CHAN_12_13_1] = {2457, 2482, 40, 30, REGULATORY_CHAN_NO_IR},
-	[CHAN_14_1] = {2474, 2494, 20, 20, REGULATORY_CHAN_NO_OFDM},
+	[CHAN_14_1] = {2474, 2494, 20, 23, REGULATORY_CHAN_NO_OFDM},
 	[CHAN_14_2] = {2474, 2494, 20, 20,
 		       REGULATORY_CHAN_NO_OFDM | REGULATORY_CHAN_NO_IR},
 };
@@ -788,8 +790,8 @@ const struct regdomain regdomains_2g[] = {
 	[FCCA] = {CTL_FCC, DFS_UNINIT_REG, 0, 6, 1, {CHAN_1_11_1} },
 	[FCCB] = {CTL_FCC, DFS_UNINIT_REG, 0, 6, 1, {CHAN_1_11_3} },
 	[WORLD] = {CTL_ETSI, DFS_UNINIT_REG, 0, 0, 1, {CHAN_1_13_1} },
-	[MKKA] = {CTL_MKK, DFS_UNINIT_REG, 0, 0, 2, {CHAN_1_13_1, CHAN_14_1} },
-	[MKKC] = {CTL_MKK, DFS_UNINIT_REG, 0, 0, 1, {CHAN_1_13_1} },
+	[MKKA] = {CTL_MKK, DFS_UNINIT_REG, 0, 0, 2, {CHAN_1_13_4, CHAN_14_1} },
+	[MKKC] = {CTL_MKK, DFS_UNINIT_REG, 0, 0, 1, {CHAN_1_13_4} },
 	[ETSIC] = {CTL_ETSI, DFS_UNINIT_REG, 0, 0, 1, {CHAN_1_13_2} },
 	[ETSID] = {CTL_ETSI, DFS_UNINIT_REG, 0, 0, 1, {CHAN_1_13_3} },
 	[WORLD_2G_1] = {CTL_NONE, DFS_UNINIT_REG, 0, 0, 1, {CHAN_1_11_2} },
@@ -829,7 +831,6 @@ enum reg_rules_5g {
 	CHAN_5250_5330_11,
 	CHAN_5250_5330_12,
 	CHAN_5250_5330_13,
-	CHAN_5250_5330_14,
 	CHAN_5490_5730_1,
 	CHAN_5490_5730_2,
 	CHAN_5490_5730_3,
@@ -843,6 +844,7 @@ enum reg_rules_5g {
 	CHAN_5490_5710_4,
 	CHAN_5490_5710_5,
 	CHAN_5490_5710_6,
+	CHAN_5490_5710_7,
 	CHAN_5490_5590_1,
 	CHAN_5490_5590_2,
 	CHAN_5490_5590_3,
@@ -902,7 +904,6 @@ const struct regulatory_rule reg_rules_5g[] = {
 	[CHAN_5250_5330_12] = {5250, 5330, 80, 23, REGULATORY_CHAN_RADAR |
 						   REGULATORY_CHAN_INDOOR_ONLY},
 	[CHAN_5250_5330_13] = {5250, 5330, 40, 30, REGULATORY_CHAN_RADAR},
-	[CHAN_5250_5330_14] = {5250, 5330, 80, 26, REGULATORY_CHAN_RADAR},
 	[CHAN_5490_5730_1] = {5490, 5730, 160, 24, REGULATORY_CHAN_RADAR},
 	[CHAN_5490_5730_2] = {5490, 5730, 160, 20, REGULATORY_CHAN_NO_IR},
 	[CHAN_5490_5730_3] = {5490, 5730, 160, 30, 0},
@@ -916,6 +917,7 @@ const struct regulatory_rule reg_rules_5g[] = {
 	[CHAN_5490_5710_4] = {5490, 5710,  40, 30, REGULATORY_CHAN_RADAR},
 	[CHAN_5490_5710_5] = {5490, 5710, 160, 24, REGULATORY_CHAN_RADAR},
 	[CHAN_5490_5710_6] = {5490, 5710, 160, 26, REGULATORY_CHAN_RADAR},
+	[CHAN_5490_5710_7] = {5490, 5710, 160, 23, REGULATORY_CHAN_RADAR},
 	[CHAN_5490_5590_1] = {5490, 5590, 80, 24, REGULATORY_CHAN_RADAR},
 	[CHAN_5490_5590_2] = {5490, 5590, 80, 30, 0},
 	[CHAN_5490_5590_3] = {5490, 5590, 80, 36, 0},
@@ -1105,14 +1107,14 @@ const struct regdomain regdomains_5g[] = {
 	[MKK3] = {CTL_MKK, DFS_UNINIT_REG, 2, 0, 1, {CHAN_5170_5250_3} },
 
 	[MKK5] = {CTL_MKK, DFS_MKK_REG, 2, 0, 3, {CHAN_5170_5250_2,
-					      CHAN_5250_5330_14,
-					      CHAN_5490_5710_6} },
+					      CHAN_5250_5330_1,
+					      CHAN_5490_5710_7} },
 
 	[MKK11] = {CTL_MKK, DFS_MKK_REG, 2, 0, 5, {CHAN_4910_4990_1,
 					       CHAN_5170_5250_2,
 					       CHAN_5030_5090_1,
-					       CHAN_5250_5330_14,
-					       CHAN_5490_5710_6} },
+					       CHAN_5250_5330_1,
+					       CHAN_5490_5710_7} },
 
 	[MKK16] = {CTL_MKK, DFS_MKK_REG, 2, 0, 1, {CHAN_5490_5710_6} },