[XS] Change in coreboot[main]: mb/trulo/var/uldrenite: Remove GPP_B5 and B6 as ISH function

[John Su (Code Review)]

John Su has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/86416?usp=email )

Change subject: mb/trulo/var/uldrenite: Remove GPP_B5 and B6 as ISH function
......................................................................

mb/trulo/var/uldrenite: Remove GPP_B5 and B6 as ISH function

It will cause suspend to fail to enter S0ix. After discussion
with SOC and HW teams, remove GPP_B5 and B6 as ISH function and
disable ISH on the devicetree.

BUG=b:383696667, b:395005219
TEST=emerge-nissa coreboot

Change-Id: Id3d26f1b604b889f4fdb6e45218f4118499c303e
Signed-off-by: John Su 
---
M src/mainboard/google/brya/variants/uldrenite/gpio.c
M src/mainboard/google/brya/variants/uldrenite/overridetree.cb
2 files changed, 5 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/86416/1

diff --git a/src/mainboard/google/brya/variants/uldrenite/gpio.c b/src/mainboard/google/brya/variants/uldrenite/gpio.c
index f926e3a..3e11b48 100644
--- a/src/mainboard/google/brya/variants/uldrenite/gpio.c
+++ b/src/mainboard/google/brya/variants/uldrenite/gpio.c
@@ -61,10 +61,10 @@
    PAD_CFG_GPI_IRQ_WAKE(GPP_B3, NONE, PWROK, LEVEL, INVERT),
    /* B4  : PROC_GP3 ==> EN_PP3300_UCAM_X */
    PAD_CFG_GPO_LOCK(GPP_B4, 1, LOCK_CONFIG),
-	/* B5  : GPP_B5 ==> ISH_I2C0_SCL */
-	PAD_CFG_NF_IOSTANDBY_IGNORE(GPP_B5, NONE, DEEP, NF1),
-	/* B6  : GPP_B6 ==> ISH_I2C0_SDA */
-	PAD_CFG_NF_IOSTANDBY_IGNORE(GPP_B6, NONE, DEEP, NF1),
+	/* B5  : GPP_B5 ==> NC */
+	PAD_NC(GPP_B5, NONE),
+	/* B6  : GPP_B6 ==> NC */
+	PAD_NC(GPP_B6, NONE),
    /* B7  : GPP_B7 ==> NC */
    PAD_NC_LOCK(GPP_B7, NONE, LOCK_CONFIG),
    /* B8  : GPP_B8 ==> NC */
diff --git a/src/mainboard/google/brya/variants/uldrenite/overridetree.cb b/src/mainboard/google/brya/variants/uldrenite/overridetree.cb
index 285db4a..dd129d7 100644
--- a/src/mainboard/google/brya/variants/uldrenite/overridetree.cb
+++ b/src/mainboard/google/brya/variants/uldrenite/overridetree.cb
@@ -490,6 +490,7 @@
    		end
    		probe DB_CELLULAR CELLULAR_RW350R
    	end # PCIE2 WWAN card
+		device ref ish off end
    	device ref shared_sram on end
    	device ref heci1 on end
    	device ref pmc hidden end