<p>Philip Chen has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/21176">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">google/gru: Support Nefario rev0<br><br>Do not assert GPIO1_B3 otherwise BT would be disabled on Nefario.<br>Also, remove DVS support for CENTERLOGIC.<br><br>BUG=b:64702054, b:63537905<br>TEST=build coreboot<br><br>Change-Id: I350db2c080f2e41ae56413f5f895557978ef0ba8<br>Signed-off-by: Philip Chen <philipchen@google.com><br>---<br>M src/mainboard/google/gru/board.h<br>M src/mainboard/google/gru/mainboard.c<br>M src/mainboard/google/gru/pwm_regulator.c<br>M src/mainboard/google/gru/romstage.c<br>4 files changed, 25 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/76/21176/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/mainboard/google/gru/board.h b/src/mainboard/google/gru/board.h<br>index f240dcf..7c63c82 100644<br>--- a/src/mainboard/google/gru/board.h<br>+++ b/src/mainboard/google/gru/board.h<br>@@ -33,7 +33,6 @@<br> #define GPIO_P30V_EN dead_code_t(gpio_t, "PP3000 doesn't exist on Scarlet")<br> #define GPIO_TP_RST_L dead_code_t(gpio_t, "don't need TP_RST_L on Scarlet")<br> #define GPIO_TPM_IRQ GPIO(1, C, 1)<br>-#define GPIO_WLAN_RST_L dead_code_t(gpio_t, "no WLAN reset on Scarlet in FW")<br> #define GPIO_WP GPIO(0, B, 5)<br> #else<br> #define GPIO_BACKLIGHT GPIO(1, C, 1)<br>@@ -44,10 +43,16 @@<br> #define GPIO_P30V_EN GPIO(0, B, 4)<br> #define GPIO_TP_RST_L GPIO(3, B, 4) /* may also be an I2C pull-up enable */<br> #define GPIO_TPM_IRQ GPIO(0, A, 5)<br>-#define GPIO_WLAN_RST_L GPIO(1, B, 3)<br> #define GPIO_WP GPIO(1, C, 2)<br> #endif<br> <br>+#if IS_ENABLED(CONFIG_BOARD_GOOGLE_SCARLET) ||\<br>+ IS_ENABLED(CONFIG_BOARD_GOOGLE_NEFARIO)<br>+#define GPIO_WLAN_RST_L dead_code_t(gpio_t, "no WLAN reset on Scarlet in FW")<br>+#else<br>+#define GPIO_WLAN_RST_L GPIO(1, B, 3)<br>+#endif<br>+<br> void setup_chromeos_gpios(void);<br> <br> #endif /* ! __COREBOOT_SRC_MAINBOARD_GOOGLE_GRU_BOARD_H */<br>diff --git a/src/mainboard/google/gru/mainboard.c b/src/mainboard/google/gru/mainboard.c<br>index 240a549..4ebcd3c 100644<br>--- a/src/mainboard/google/gru/mainboard.c<br>+++ b/src/mainboard/google/gru/mainboard.c<br>@@ -44,7 +44,8 @@<br> /*<br> * Wifi's PDN/RST line is pulled down by its (unpowered) voltage rails, but<br> * this reset pin is pulled up by default. Let's drive it low as early as we<br>- * can. Scarlet uses a different WiFi chip that doesn't have this pin anymore.<br>+ * can. Scarlet and Nefario use a different WiFi chip that doesn't have this<br>+ * pin anymore.<br> */<br> static void assert_wifi_reset(void)<br> {<br>@@ -350,7 +351,9 @@<br> configure_display();<br> setup_usb(0);<br> if (!IS_ENABLED(CONFIG_BOARD_GOOGLE_SCARLET)) {<br>- assert_wifi_reset(); /* Scarlet: no WIFI_PD# line */<br>+ /* Scarlet and Nefario: no WIFI_PD# line */<br>+ if (!IS_ENABLED(CONFIG_BOARD_GOOGLE_NEFARIO))<br>+ assert_wifi_reset();<br> configure_touchpad(); /* Scarlet: works differently */<br> setup_usb(1); /* Scarlet: only one USB port */<br> register_gpio_suspend(); /* Scarlet: all EC-controlled */<br>diff --git a/src/mainboard/google/gru/pwm_regulator.c b/src/mainboard/google/gru/pwm_regulator.c<br>index 3ee74a4..329a757 100644<br>--- a/src/mainboard/google/gru/pwm_regulator.c<br>+++ b/src/mainboard/google/gru/pwm_regulator.c<br>@@ -40,12 +40,14 @@<br> [PWM_REGULATOR_CENTERLOG] = {8001, 10497}<br> };<br> <br>-/* Applies for Gru rev2+ and Bob. */<br>+/* Applies for Gru rev2+, Bob, and Nefario. */<br> int pwm_design_voltage[][2] = {<br> [PWM_REGULATOR_GPU] = {7864, 12177},<br> [PWM_REGULATOR_BIG] = {8001, 13022},<br> [PWM_REGULATOR_LIT] = {7977, 13078},<br>+#if !IS_ENABLED(CONFIG_BOARD_GOOGLE_NEFARIO)<br> [PWM_REGULATOR_CENTERLOG] = {7994, 10499}<br>+#endif<br> };<br> <br> /* Applies for Scarlet */<br>@@ -58,12 +60,17 @@<br> int pwm_enum_to_pwm_number[] = {<br> [PWM_REGULATOR_GPU] = 0,<br> [PWM_REGULATOR_LIT] = 2,<br>+#if IS_ENABLED(CONFIG_BOARD_GOOGLE_SCARLET) ||\<br>+ IS_ENABLED(CONFIG_BOARD_GOOGLE_NEFARIO)<br>+ /* Fixed regulator on Nefario and Scarlet */<br>+ [PWM_REGULATOR_CENTERLOG] = -1,<br>+#else<br>+ [PWM_REGULATOR_CENTERLOG] = 3,<br>+#endif<br> #if IS_ENABLED(CONFIG_BOARD_GOOGLE_SCARLET)<br> [PWM_REGULATOR_BIG] = 3,<br>- [PWM_REGULATOR_CENTERLOG] = -1, /* fixed regulator on Scarlet */<br> #else<br> [PWM_REGULATOR_BIG] = 1,<br>- [PWM_REGULATOR_CENTERLOG] = 3,<br> #endif<br> };<br> <br>diff --git a/src/mainboard/google/gru/romstage.c b/src/mainboard/google/gru/romstage.c<br>index bde61b2..5fb5330 100644<br>--- a/src/mainboard/google/gru/romstage.c<br>+++ b/src/mainboard/google/gru/romstage.c<br>@@ -42,10 +42,11 @@<br> pwm_regulator_configure(PWM_REGULATOR_BIG, 900);<br> <br> /* Kevin's logic rail has some ripple, so up the voltage a bit. Scarlet<br>- uses a fixed 900mV regulator for centerlogic. */<br>+ and Nefario use a fixed 900mV regulator for centerlogic. */<br> if (IS_ENABLED(CONFIG_BOARD_GOOGLE_KEVIN))<br> pwm_regulator_configure(PWM_REGULATOR_CENTERLOG, 925);<br>- else if (!IS_ENABLED(CONFIG_BOARD_GOOGLE_SCARLET))<br>+ else if (!IS_ENABLED(CONFIG_BOARD_GOOGLE_SCARLET) &&<br>+ !IS_ENABLED(CONFIG_BOARD_GOOGLE_NEFARIO))<br> pwm_regulator_configure(PWM_REGULATOR_CENTERLOG, 900);<br> <br> /* Allow time for the regulators to settle */<br></pre><p>To view, visit <a href="https://review.coreboot.org/21176">change 21176</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/21176"/><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: I350db2c080f2e41ae56413f5f895557978ef0ba8 </div>
<div style="display:none"> Gerrit-Change-Number: 21176 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Philip Chen <philipchen@google.com> </div>