[coreboot-gerrit] Change in coreboot[master]: qualcomm/sc7280: gpio: Support eGPIO scheme

[Shelley Chen (Code Review)]

Shelley Chen has submitted this change. ( https://review.coreboot.org/c/coreboot/+/58580 )

Change subject: qualcomm/sc7280: gpio: Support eGPIO scheme
......................................................................

qualcomm/sc7280: gpio: Support eGPIO scheme

eGPIO is a scheme which allows special power island domain IOs to be
reused as regular chip GPIOs by muxing regular TLMM functions with
Island Domain functions. Allow the eGPIO to be configured via
gpio_configure API to be used as a TLMM gpio.

BUG=b:182963902
TEST=Validated on qualcomm sc7280 development board

Signed-off-by: Taniya Das 
Change-Id: Ib2598a41ba3bb8a8a2acff8253b5bb78633f89f9
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58580
Tested-by: build bot (Jenkins) 
Reviewed-by: Shelley Chen 
---
M src/soc/qualcomm/common/gpio.c
M src/soc/qualcomm/common/include/soc/gpio_common.h
2 files changed, 5 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Shelley Chen: Looks good to me, approved

diff --git a/src/soc/qualcomm/common/gpio.c b/src/soc/qualcomm/common/gpio.c
index 1ed8e8a..5053f3b 100644
--- a/src/soc/qualcomm/common/gpio.c
+++ b/src/soc/qualcomm/common/gpio.c
@@ -16,7 +16,9 @@
    reg_val = ((enable & GPIO_BMSK) << GPIO_CFG_OE_SHFT) |
    	  ((drive_str & GPIO_CFG_DRV_BMSK) << GPIO_CFG_DRV_SHFT) |
    	  ((func & GPIO_CFG_FUNC_BMSK) << GPIO_CFG_FUNC_SHFT) |
-		  ((pull & GPIO_CFG_PULL_BMSK) << GPIO_CFG_PULL_SHFT);
+		  ((pull & GPIO_CFG_PULL_BMSK) << GPIO_CFG_PULL_SHFT) |
+		  ((read32(&regs->cfg) & GPIO_CFG_EGPIO_BMSK)
+			<< GPIO_CFG_EGPIO_SHFT);

write32(&regs->cfg, reg_val);
 }
diff --git a/src/soc/qualcomm/common/include/soc/gpio_common.h b/src/soc/qualcomm/common/include/soc/gpio_common.h
index 20f947a..18cd040 100644
--- a/src/soc/qualcomm/common/include/soc/gpio_common.h
+++ b/src/soc/qualcomm/common/include/soc/gpio_common.h
@@ -21,6 +21,7 @@
    GPIO_CFG_PULL_BMSK = 0x3,
    GPIO_CFG_FUNC_BMSK = 0xF,
    GPIO_CFG_DRV_BMSK = 0x7,
+	GPIO_CFG_EGPIO_BMSK = 0x800,
 };

/* GPIO TLMM INTR: Shift */
@@ -35,6 +36,7 @@
    GPIO_CFG_FUNC_SHFT = 2,
    GPIO_CFG_DRV_SHFT = 6,
    GPIO_CFG_OE_SHFT = 9,
+	GPIO_CFG_EGPIO_SHFT = 1,
 };

/* GPIO IO: Shift */