mfd/fusb302: fix request max voltage config

1. VPDO max voltage is bit20~29, VPD0 MIN votage is bit10~19.
2. (CAP_FPDO_VOLTAGE << 10) & 0x3ff == 0, it's wrong.
3. CAP_FPDO_VOLTAGE/CAP_VPDO_VOLTAGE has included (& 0x3ff).

Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: Ife5e634bcffcc9b6c3d68d6e5f504c06b01cf418

Author: Weixin Zhou

drivers/mfd/fusb302.c

@@ -188,12 +188,12 @@ static void fusb_set_pos_power(struct fusb30x_chip *chip, int max_vol,
 			break;
 		case 1:
 			/* Battery */
-			if ((CAP_VPDO_VOLTAGE(chip->rec_load[i]) * 50) <=
+			if ((CAP_VPDO_MAX_VOLTAGE(chip->rec_load[i]) * 50) <=
 			    max_vol &&
 			    (CAP_VPDO_CURRENT(chip->rec_load[i]) * 10) <=
 			    max_cur) {
 				chip->pos_power = i + 1;
-				tmp = CAP_VPDO_VOLTAGE(chip->rec_load[i]);
+				tmp = CAP_VPDO_MAX_VOLTAGE(chip->rec_load[i]);
 				chip->pd_output_vol = tmp * 50;
 				tmp = CAP_VPDO_CURRENT(chip->rec_load[i]);
 				chip->pd_output_cur = tmp * 10;
@@ -965,13 +965,14 @@ static void set_mesg(struct fusb30x_chip *chip, int cmd, int is_DMT)
 			switch (CAP_POWER_TYPE(chip->rec_load[chip->pos_power - 1])) {
 			case 0:
 				/* Fixed Supply */
-				chip->send_load[0] |= ((CAP_FPDO_VOLTAGE(chip->rec_load[chip->pos_power - 1]) << 10) & 0x3ff);
-				chip->send_load[0] |= (CAP_FPDO_CURRENT(chip->rec_load[chip->pos_power - 1]) & 0x3ff);
+				chip->send_load[0] |= CAP_FPDO_VOLTAGE(chip->rec_load[chip->pos_power - 1]) << 10;
+				chip->send_load[0] |= CAP_FPDO_CURRENT(chip->rec_load[chip->pos_power - 1]);
 				break;
 			case 1:
 				/* Battery */
-				chip->send_load[0] |= ((CAP_VPDO_VOLTAGE(chip->rec_load[chip->pos_power - 1]) << 10) & 0x3ff);
-				chip->send_load[0] |= (CAP_VPDO_CURRENT(chip->rec_load[chip->pos_power - 1]) & 0x3ff);
+				chip->send_load[0] |= CAP_VPDO_MAX_VOLTAGE(chip->rec_load[chip->pos_power - 1]) << 20;
+				chip->send_load[0] |= CAP_VPDO_MIN_VOLTAGE(chip->rec_load[chip->pos_power - 1]) << 10;
+				chip->send_load[0] |= CAP_VPDO_CURRENT(chip->rec_load[chip->pos_power - 1]);
 				break;
 			default:
 				/* not meet battery caps */
@@ -2529,7 +2530,7 @@ static void fusb_state_snk_evaluate_caps(struct fusb30x_chip *chip, u32 evt)
 			break;
 		case 1:
 			/* Battery */
-			if (CAP_VPDO_VOLTAGE(chip->rec_load[tmp]) <= 100)
+			if (CAP_VPDO_MAX_VOLTAGE(chip->rec_load[tmp]) <= 100)
 				chip->pos_power = tmp + 1;
 			break;
 		default:

drivers/mfd/fusb302.h

@@ -411,7 +411,8 @@ enum role_mode {
 
 #define CAP_POWER_TYPE(PDO)		((PDO >> 30) & 3)
 #define CAP_FPDO_VOLTAGE(PDO)		((PDO >> 10) & 0x3ff)
-#define CAP_VPDO_VOLTAGE(PDO)		((PDO >> 20) & 0x3ff)
+#define CAP_VPDO_MAX_VOLTAGE(PDO)	((PDO >> 20) & 0x3ff)
+#define CAP_VPDO_MIN_VOLTAGE(PDO)	((PDO >> 10) & 0x3ff)
 #define CAP_FPDO_CURRENT(PDO)		((PDO >> 0) & 0x3ff)
 #define CAP_VPDO_CURRENT(PDO)		((PDO >> 0) & 0x3ff)