<p>Shelley Chen has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23294">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">google/fizz: Fix barrel jack values for U42 and U22<br><br>Our current U22 skus (celeron and i3) actually don't support PL2,<br>but making sure that if we do decide in the future to use it to<br>make sure PL2 and PsysPl2 values are set appropriately.<br><br>BUG=b:71594855<br>BRANCH=None<br>TEST=Make sure that PsysPL2 value set to 90W with barrel jack for U42<br> and 65W with barrel jack for U22.<br><br>Change-Id: I084d0320128a6e05948023520a30c497c41be23b<br>Signed-off-by: Shelley Chen <shchen@chromium.org><br>---<br>M src/mainboard/google/fizz/mainboard.c<br>1 file changed, 34 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/94/23294/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/fizz/mainboard.c b/src/mainboard/google/fizz/mainboard.c</span><br><span>index 8bdab22..e6e7f86 100644</span><br><span>--- a/src/mainboard/google/fizz/mainboard.c</span><br><span>+++ b/src/mainboard/google/fizz/mainboard.c</span><br><span>@@ -28,10 +28,17 @@</span><br><span> #include <string.h></span><br><span> #include <vendorcode/google/chromeos/chromeos.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define FIZZ_SKU_ID_I7_U42 0x4</span><br><span style="color: hsl(0, 100%, 40%);">-#define FIZZ_PL2_I7_U42 44</span><br><span style="color: hsl(0, 100%, 40%);">-#define FIZZ_PL2_OTHERS 29</span><br><span style="color: hsl(0, 100%, 40%);">-#define FIZZ_PSYSPL2_ALL 90</span><br><span style="color: hsl(120, 100%, 40%);">+#define FIZZ_SKU_ID_I7_U42 0x4</span><br><span style="color: hsl(120, 100%, 40%);">+#define FIZZ_SKU_ID_I5_U42 0x5</span><br><span style="color: hsl(120, 100%, 40%);">+#define FIZZ_SKU_ID_I3_U42 0x6</span><br><span style="color: hsl(120, 100%, 40%);">+#define FIZZ_SKU_ID_I7_U22 0x3</span><br><span style="color: hsl(120, 100%, 40%);">+#define FIZZ_SKU_ID_I5_U22 0x2</span><br><span style="color: hsl(120, 100%, 40%);">+#define FIZZ_SKU_ID_I3_U22 0x1</span><br><span style="color: hsl(120, 100%, 40%);">+#define FIZZ_SKU_ID_CEL_U22 0x0</span><br><span style="color: hsl(120, 100%, 40%);">+#define FIZZ_PL2_U42 44</span><br><span style="color: hsl(120, 100%, 40%);">+#define FIZZ_PL2_U22 29</span><br><span style="color: hsl(120, 100%, 40%);">+#define FIZZ_PSYSPL2_U22 65</span><br><span style="color: hsl(120, 100%, 40%);">+#define FIZZ_PSYSPL2_U42 90</span><br><span> /*</span><br><span> * For type-C chargers, set PL2 to 90% of max power to account for</span><br><span> * cable loss and FET Rdson loss in the path from the source.</span><br><span>@@ -100,6 +107,18 @@</span><br><span> * mainboard_set_power_limits</span><br><span> *</span><br><span> * Set Pl2 and SysPl2 values based on detected charger.</span><br><span style="color: hsl(120, 100%, 40%);">+ * If detected barrel jack, use values below based on SKU.</span><br><span style="color: hsl(120, 100%, 40%);">+ * +-------------+-----+---------+-------------------+</span><br><span style="color: hsl(120, 100%, 40%);">+ * | sku_id | PL2 | PsysPL2 | Pmax (Prop = 48W) |</span><br><span style="color: hsl(120, 100%, 40%);">+ * +-------------+-----+---------+-------------------+</span><br><span style="color: hsl(120, 100%, 40%);">+ * | i7 U42 | 44 | 90 | 119 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | i5 U42 | 44 | 90 | 119 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | i3 U42 | 44 | 90 | 119 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | i7 U22 | 29 | 65 | 91 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | i5 U22 | 29 | 65 | 91 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | i3 U22 | 29 | 65 | 91 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | celeron U22 | 29 | 65 | 91 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * +-------------+-----+---------+-------------------+</span><br><span> */</span><br><span> static void mainboard_set_power_limits(u32 *pl2_val, u32 *psyspl2_val)</span><br><span> {</span><br><span>@@ -112,12 +131,18 @@</span><br><span> /* If we can't get charger info or not PD charger, assume barrel jack */</span><br><span> if (rv != 0 || type != USB_CHG_TYPE_PD) {</span><br><span> /* using the barrel jack, get PL2 based on sku id */</span><br><span style="color: hsl(0, 100%, 40%);">- pl2 = FIZZ_PL2_OTHERS;</span><br><span style="color: hsl(0, 100%, 40%);">- if (board_sku_id() == FIZZ_SKU_ID_I7_U42)</span><br><span style="color: hsl(0, 100%, 40%);">- pl2 = FIZZ_PL2_I7_U42;</span><br><span style="color: hsl(0, 100%, 40%);">- /* PsysPl2 same for all SKUs */</span><br><span style="color: hsl(0, 100%, 40%);">- psyspl2 = FIZZ_PSYSPL2_ALL;</span><br><span style="color: hsl(120, 100%, 40%);">+ pl2 = FIZZ_PL2_U22;</span><br><span style="color: hsl(120, 100%, 40%);">+ psyspl2 = FIZZ_PSYSPL2_U22;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Running a U42 SKU */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (board_sku_id() == FIZZ_SKU_ID_I7_U42 ||</span><br><span style="color: hsl(120, 100%, 40%);">+ board_sku_id() == FIZZ_SKU_ID_I5_U42 ||</span><br><span style="color: hsl(120, 100%, 40%);">+ board_sku_id() == FIZZ_SKU_ID_I3_U42) {</span><br><span style="color: hsl(120, 100%, 40%);">+ pl2 = FIZZ_PL2_U42;</span><br><span style="color: hsl(120, 100%, 40%);">+ psyspl2 = FIZZ_PSYSPL2_U42;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Base on max value of adapter */</span><br><span> pl2 = GET_TYPEC_PL2(watts);</span><br><span> psyspl2 = watts;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23294">change 23294</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/23294"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I084d0320128a6e05948023520a30c497c41be23b </div>
<div style="display:none"> Gerrit-Change-Number: 23294 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Shelley Chen <shchen@google.com> </div>