[coreboot-gerrit] Change in ...coreboot[master]: mb/poppy/variant/nami: Move FPMCU_INT_L gpios to B group

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/29872 )

Change subject: mb/poppy/variant/nami: Move FPMCU_INT_L gpios to B group
......................................................................

mb/poppy/variant/nami: Move FPMCU_INT_L gpios to B group

We discovered that the gpios previously used for FPMCU_INT_L were in
two different groups with two different voltages (C group was at 3.3V
and D group was at 1.8V).  Moving both to B group which is at 3.3V.

BUG=b:119447525
BRANCH=Nami
TEST=unlock OS with fingerprint
     register fingerprint
     run powerd_dbus_suspend and see if it goes int s0ix

Change-Id: I2332b0eb7a2f74e8178b95a23c8ac2091027a071
Signed-off-by: Shelley Chen <shchen at google.com>
Reviewed-on: https://review.coreboot.org/c/29872
Tested-by: build bot (Jenkins) <no-reply at coreboot.org>
Reviewed-by: Ren Kuo <ren.kuo at quanta.corp-partner.google.com>
Reviewed-by: Furquan Shaikh <furquan at google.com>
---
M src/mainboard/google/poppy/variants/nami/devicetree.cb
M src/mainboard/google/poppy/variants/nami/gpio.c
2 files changed, 6 insertions(+), 6 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved
  Ren Kuo: Looks good to me, but someone else must approve



diff --git a/src/mainboard/google/poppy/variants/nami/devicetree.cb b/src/mainboard/google/poppy/variants/nami/devicetree.cb
index edf7ed6..d4e5d2f 100644
--- a/src/mainboard/google/poppy/variants/nami/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/nami/devicetree.cb
@@ -469,8 +469,8 @@
 				register "hid" = "ACPI_DT_NAMESPACE_HID"
 				register "uid" = "1"
 				register "compat_string" = ""google,cros-ec-spi""
-				register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_C8_IRQ)"
-				register "wake" = "GPE0_DW1_06" # GPP_D6
+				register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_B0_IRQ)"
+				register "wake" = "GPE0_DW0_01" # GPP_B1
 				device spi 0 on end
 			end # FPMCU
 		end # GSPI #1
diff --git a/src/mainboard/google/poppy/variants/nami/gpio.c b/src/mainboard/google/poppy/variants/nami/gpio.c
index 2c9b932..a1a0f92 100644
--- a/src/mainboard/google/poppy/variants/nami/gpio.c
+++ b/src/mainboard/google/poppy/variants/nami/gpio.c
@@ -409,6 +409,10 @@
 };
 
 static const struct pad_config fpmcu_gpio_table[] = {
+	/* B0  : CORE_VID0 ==> FPMCU_INT_L */
+	PAD_CFG_GPI_APIC(GPP_B0, NONE, DEEP),
+	/* B1  : CORE_VID1 ==> FPMCU_INT_L */
+	PAD_CFG_GPI_ACPI_SCI(GPP_B1, 20K_PU, DEEP, INVERT),
 	/* B11 : EXT_PWR_GATE# ==> PCH_FP_PWR_EN */
 	PAD_CFG_GPO(GPP_B11, 1, DEEP),
 	/* B19 : GSPI1_CS# ==> PCH_SPI_FP_CS# */
@@ -421,14 +425,10 @@
 	PAD_CFG_NF(GPP_B22, NONE, DEEP, NF1),
 	/* C3  : SML0CLK ==> TOUCHSCREEN_DIS# */
 	PAD_CFG_GPO(GPP_C3, 0, DEEP),
-	/* C8  : UART0_RXD ==> FPMCU_INT_L */
-	PAD_CFG_GPI_APIC(GPP_C8, NONE, DEEP),
 	/* C9  : UART0_TXD ==> FP_RST_ODL */
 	PAD_CFG_GPO(GPP_C9, 1, DEEP),
 	/* D5  : ISH_I2C0_SDA ==> FPMCU_BOOT0 */
 	PAD_CFG_GPO(GPP_D5, 0, DEEP),
-	/* D6  : ISH_I2C0_SCL ==> FPMCU_INT_L */
-	PAD_CFG_GPI_ACPI_SCI(GPP_D6, 20K_PU, DEEP, INVERT),
 	/* D17 : DMIC_CLK1 ==> NC */
 	PAD_CFG_NC(GPP_D17),
 };

-- 
To view, visit https://review.coreboot.org/c/coreboot/+/29872
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I2332b0eb7a2f74e8178b95a23c8ac2091027a071
Gerrit-Change-Number: 29872
Gerrit-PatchSet: 3
Gerrit-Owner: Shelley Chen <shchen at google.com>
Gerrit-Reviewer: Furquan Shaikh <furquan at google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi at google.com>
Gerrit-Reviewer: Ren Kuo <ren.kuo at quanta.corp-partner.google.com>
Gerrit-Reviewer: Shelley Chen <shchen at google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply at coreboot.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181203/9e1cefd6/attachment.html>