From a8e9dbae65cad1a9c655aa5f71bfe3b097348843 Mon Sep 17 00:00:00 2001 From: Ravi Kumar Bokka Date: Sat, 10 Jul 2021 23:54:20 +0530 Subject: [PATCH] sc7180: Renaming the GPIO macro in QSPI and I2C driver As part of GPIO driver cleanup across qcom chipsets, GPIO_OUTPUT_ENABLE has been renamed to GPIO_OUTPUT. BUG=b:182963902 TEST=Validated on qualcomm sc7180 development board Signed-off-by: Rajesh Patil Change-Id: I51eedc722a91c5ea8e009fb8468a60667d374b49 Reviewed-on: https://review.coreboot.org/c/coreboot/+/56194 Tested-by: build bot (Jenkins) Reviewed-by: Shelley Chen --- src/soc/qualcomm/sc7180/qspi.c | 6 +++--- src/soc/qualcomm/sc7180/qupv3_i2c.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/soc/qualcomm/sc7180/qspi.c b/src/soc/qualcomm/sc7180/qspi.c index c1e9779736..825e298a73 100644 --- a/src/soc/qualcomm/sc7180/qspi.c +++ b/src/soc/qualcomm/sc7180/qspi.c @@ -146,13 +146,13 @@ static void configure_gpios(void) gpio_output(GPIO(68), 1); gpio_configure(GPIO(64), GPIO64_FUNC_QSPI_DATA_0, - GPIO_NO_PULL, GPIO_2MA, GPIO_OUTPUT_ENABLE); + GPIO_NO_PULL, GPIO_2MA, GPIO_OUTPUT); gpio_configure(GPIO(65), GPIO65_FUNC_QSPI_DATA_1, - GPIO_NO_PULL, GPIO_2MA, GPIO_OUTPUT_ENABLE); + GPIO_NO_PULL, GPIO_2MA, GPIO_OUTPUT); gpio_configure(GPIO(63), GPIO63_FUNC_QSPI_CLK, - GPIO_NO_PULL, GPIO_8MA, GPIO_OUTPUT_ENABLE); + GPIO_NO_PULL, GPIO_8MA, GPIO_OUTPUT); } static void queue_bounce_data(uint8_t *data, uint32_t data_bytes, diff --git a/src/soc/qualcomm/sc7180/qupv3_i2c.c b/src/soc/qualcomm/sc7180/qupv3_i2c.c index c9adba4fbf..5dc4d314b1 100644 --- a/src/soc/qualcomm/sc7180/qupv3_i2c.c +++ b/src/soc/qualcomm/sc7180/qupv3_i2c.c @@ -92,9 +92,9 @@ void i2c_init(unsigned int bus, enum i2c_speed speed) /* GPIO Configuration */ gpio_configure(qup[bus].pin[0], qup[bus].func[0], GPIO_PULL_UP, - GPIO_2MA, GPIO_OUTPUT_ENABLE); + GPIO_2MA, GPIO_OUTPUT); gpio_configure(qup[bus].pin[1], qup[bus].func[1], GPIO_PULL_UP, - GPIO_2MA, GPIO_OUTPUT_ENABLE); + GPIO_2MA, GPIO_OUTPUT); /* Select and setup FIFO mode */ write32(®s->geni_m_irq_clear, 0xFFFFFFFF);