[coreboot-gerrit] Change in coreboot[master]: [WIP] Add a voltage parameter for getting info from USB PD

[Gaggery Tsai (Code Review)]

Gaggery Tsai has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/39849 )

Change subject: [WIP] Add a voltage parameter for getting info from USB PD
......................................................................

[WIP] Add a voltage parameter for getting info from USB PD

This patch adds a voltage parameter in google_chromeec_get_usb_pd_power_info.
For some application, we need the voltage information.

BUG=b:151972149
TEST=emerge-puff coreboot; emerge-fizz coreboot

Change-Id: I11efe6f45f2f929fcb2763d192268e677d7426cb
Signed-off-by: Gaggery Tsai 
---
M src/ec/google/chromeec/ec.c
M src/ec/google/chromeec/ec.h
M src/mainboard/google/fizz/mainboard.c
M src/mainboard/google/hatch/variants/puff/mainboard.c
4 files changed, 7 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/39849/1

diff --git a/src/ec/google/chromeec/ec.c b/src/ec/google/chromeec/ec.c
index 8f1f864..78f808c 100644
--- a/src/ec/google/chromeec/ec.c
+++ b/src/ec/google/chromeec/ec.c
@@ -1128,7 +1128,7 @@

/* Get charger power info in Watts.  Also returns type of charger */
 int google_chromeec_get_usb_pd_power_info(enum usb_chg_type *type,
-					  uint32_t *max_watts)
+					  uint32_t *max_watts, uint16_t *mini_volts)
 {
    struct ec_params_usb_pd_power_info params = {
    	.port = PD_POWER_CHARGING_PORT,
@@ -1154,7 +1154,7 @@
    *type = resp.type;
    m = resp.meas;
    *max_watts = (m.current_max * m.voltage_max) / 1000000;
-
+	*mini_volts = m.voltage_max;
    return 0;
 }

diff --git a/src/ec/google/chromeec/ec.h b/src/ec/google/chromeec/ec.h
index 60afb50..9b46ad9 100644
--- a/src/ec/google/chromeec/ec.h
+++ b/src/ec/google/chromeec/ec.h
@@ -109,7 +109,7 @@
  * @return non-zero for error, otherwise 0.
  */
 int google_chromeec_get_usb_pd_power_info(enum usb_chg_type *type,
-					  uint32_t *max_watts);
+					  uint32_t *max_watts, uint16_t *mini_volts);

/*
  * Set max current and voltage of a dedicated charger.
diff --git a/src/mainboard/google/fizz/mainboard.c b/src/mainboard/google/fizz/mainboard.c
index 6bb298b..7464b9f 100644
--- a/src/mainboard/google/fizz/mainboard.c
+++ b/src/mainboard/google/fizz/mainboard.c
@@ -115,8 +115,9 @@
 {
    enum usb_chg_type type;
    u32 watts;
+	u16 mini_volts;
    u32 pl2, psyspl2;
-	int rv = google_chromeec_get_usb_pd_power_info(&type, &watts);
+	int rv = google_chromeec_get_usb_pd_power_info(&type, &watts, &mini_volts);
    uint8_t sku = board_sku_id();
    const uint32_t u42_mask = (1 << FIZZ_SKU_ID_I7_U42) |
    			  (1 << FIZZ_SKU_ID_I5_U42) |
diff --git a/src/mainboard/google/hatch/variants/puff/mainboard.c b/src/mainboard/google/hatch/variants/puff/mainboard.c
index 7dcd8c7..f00f47f 100644
--- a/src/mainboard/google/hatch/variants/puff/mainboard.c
+++ b/src/mainboard/google/hatch/variants/puff/mainboard.c
@@ -101,8 +101,9 @@
 {
    enum usb_chg_type type;
    u32 watts;
+	u16 mini_volts;
    u32 psyspl2 = PUFF_PSYSPL2; // default barrel jack value for U22
-	int rv = google_chromeec_get_usb_pd_power_info(&type, &watts);
+	int rv = google_chromeec_get_usb_pd_power_info(&type, &watts, &mini_volts);

/* use SoC default value for PsysPL3 and PL4 unless we're on USB-PD*/
    conf->tdp_psyspl3 = 0;