<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28905">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/kahlee: Update I2c values for older careena boards<br><br>The I2C values are typically set in devicetree.cb, but there's an issue<br>where the values need to change between board versions. This allows<br>the mainboard to update the settings at runtime.<br><br>BUG=B:110984023<br>TEST=I2C is set correctly on each version.<br><br>Change-Id: I1d17c502244c43e9a8f89471f7b04b3467a6e486<br>Signed-off-by: Martin Roth <martinroth@chromium.org><br>---<br>M src/mainboard/google/kahlee/variants/careena/Makefile.inc<br>A src/mainboard/google/kahlee/variants/careena/i2c.c<br>2 files changed, 52 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/05/28905/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/kahlee/variants/careena/Makefile.inc b/src/mainboard/google/kahlee/variants/careena/Makefile.inc</span><br><span>index 0579e18..559b70d 100644</span><br><span>--- a/src/mainboard/google/kahlee/variants/careena/Makefile.inc</span><br><span>+++ b/src/mainboard/google/kahlee/variants/careena/Makefile.inc</span><br><span>@@ -15,6 +15,9 @@</span><br><span> </span><br><span> subdirs-y += ../baseboard/spd</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+bootblock-y += i2c.c</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> romstage-y += ../baseboard/romstage.c</span><br><span> </span><br><span> ramstage-y += ../baseboard/mainboard.c</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-y += i2c.c</span><br><span>diff --git a/src/mainboard/google/kahlee/variants/careena/i2c.c b/src/mainboard/google/kahlee/variants/careena/i2c.c</span><br><span>new file mode 100644</span><br><span>index 0000000..2c06fc1</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/kahlee/variants/careena/i2c.c</span><br><span>@@ -0,0 +1,49 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * This file is part of the coreboot project.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright 2018 Google LLC</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; version 2 of the License.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <boardid.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <ec/google/chromeec/ec.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <soc/southbridge.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* I2C0 for audio, USB3 hub at 400kHz */</span><br><span style="color: hsl(120, 100%, 40%);">+struct dw_i2c_bus_config careena4_i2c_0 = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .speed = I2C_SPEED_FAST,</span><br><span style="color: hsl(120, 100%, 40%);">+ .rise_time_ns = 95,</span><br><span style="color: hsl(120, 100%, 40%);">+ .fall_time_ns = 3,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* I2C2 for trackpad */</span><br><span style="color: hsl(120, 100%, 40%);">+struct dw_i2c_bus_config careena4_i2c_2 = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .speed = I2C_SPEED_FAST,</span><br><span style="color: hsl(120, 100%, 40%);">+ .rise_time_ns = 67,</span><br><span style="color: hsl(120, 100%, 40%);">+ .fall_time_ns = 55,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Change timings for older revisions of the board */</span><br><span style="color: hsl(120, 100%, 40%);">+void mb_update_i2c(unsigned int bus, const struct dw_i2c_bus_config **i2c_vals)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t board_id = board_id();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (board_id > 2 && board_id < 5) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (bus) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ *i2c_vals = &careena4_i2c_0;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 2:</span><br><span style="color: hsl(120, 100%, 40%);">+ *i2c_vals = &careena4_i2c_2;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28905">change 28905</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/28905"/><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: I1d17c502244c43e9a8f89471f7b04b3467a6e486 </div>
<div style="display:none"> Gerrit-Change-Number: 28905 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>