<p>Lin Huang has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/20803">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">google/gru: Correct the Sdcard control gpio setting for Scarlet<br><br>in Scarlet Sdcard control gpio different with other<br>project, let's correct it.<br><br>Change-Id: I5fa19b212a716213462eea58b6242392d32a2c5c<br>Signed-off-by: Lin Huang <hl@rock-chips.com><br>---<br>M src/mainboard/google/gru/bootblock.c<br>M src/mainboard/google/gru/mainboard.c<br>2 files changed, 13 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/20803/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/mainboard/google/gru/bootblock.c b/src/mainboard/google/gru/bootblock.c<br>index d0a5182..c5ab28a 100644<br>--- a/src/mainboard/google/gru/bootblock.c<br>+++ b/src/mainboard/google/gru/bootblock.c<br>@@ -44,7 +44,7 @@<br> */<br> write32(&rk3399_grf->io_vsel, RK_SETBITS(1 << 0));<br> <br>- /* Scarlet gpio2ab iodomain is 1.8V */<br>+ /* Scarlet gpio4cd iodomain is 1.8V */<br> if (IS_ENABLED(CONFIG_BOARD_GOOGLE_SCARLET))<br> write32(&rk3399_grf->io_vsel, RK_SETBITS(1 << 3));<br> <br>diff --git a/src/mainboard/google/gru/mainboard.c b/src/mainboard/google/gru/mainboard.c<br>index 2542d74..d39a7fc 100644<br>--- a/src/mainboard/google/gru/mainboard.c<br>+++ b/src/mainboard/google/gru/mainboard.c<br>@@ -167,13 +167,21 @@<br> {<br> gpio_output(GPIO(2, A, 2), 1); /* SDMMC_SDIO_PWR_EN */<br> <br>- /* SDMMC_DET_L is different on Kevin board revision 0. */<br>- if (IS_ENABLED(CONFIG_BOARD_GOOGLE_KEVIN) && (board_id() == 0))<br>- gpio_input(GPIO(4, D, 2));<br>+ /* set SDMMC_DET_L pin */<br>+ if (IS_ENABLED(CONFIG_BOARD_GOOGLE_SCARLET))<br>+ gpio_input(GPIO(1, B, 3));<br> else<br> gpio_input(GPIO(4, D, 0));<br> <br>- gpio_output(GPIO(2, D, 4), 0); /* Keep the max voltage */<br>+ /*<br>+ * Keep sd card io domain 3v<br>+ * in Scarlet this gpio set to high will get 3v<br>+ * other project set this gpio to low will get 3v<br>+ */<br>+ if (IS_ENABLED(CONFIG_BOARD_GOOGLE_SCARLET))<br>+ gpio_output(GPIO(2, D, 4), 1);<br>+ else<br>+ gpio_output(GPIO(2, D, 4), 0);<br> <br> gpio_input(GPIO(4, B, 0)); /* SDMMC0_D0 remove pull-up */<br> gpio_input(GPIO(4, B, 1)); /* SDMMC0_D1 remove pull-up */<br></pre><p>To view, visit <a href="https://review.coreboot.org/20803">change 20803</a>. To unsubscribe, 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/20803"/><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: I5fa19b212a716213462eea58b6242392d32a2c5c </div>
<div style="display:none"> Gerrit-Change-Number: 20803 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Lin Huang <hl@rock-chips.com> </div>