soc/mediatek: Remove redundant struct pad_func and PAD_* definitions

Clean up redundant `struct pad_func` and `PAD_*` definitions. This patch
also refactors the PAD_* macros by,
- Repurposing PAD_FUNC and dropping PAD_FUNC_SEL.
- Adding PAD_FUNC_DOWN and PAD_FUNC_UP to avoid the implicit
  initialization.

BUG=none
TEST=emerge-{elm, kukui, asurada, cherry, corsola, geralt, rauru} coreboot

Change-Id: I12b8f6749015bff52988208a7c3aa01e952612c6
Signed-off-by: Yidi Lin <yidilin@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/84222
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

2 files changed, 37 insertions, 52 deletions

diff --git a/src/soc/mediatek/mt8183/i2c.c b/src/soc/mediatek/mt8183/i2c.c
index 8bd7c36395..c23377e8af 100644
--- a/src/soc/mediatek/mt8183/i2c.c
+++ b/src/soc/mediatek/mt8183/i2c.c
@@ -53,41 +53,34 @@ struct mtk_i2c mtk_i2c_bus_controller[] = {
 _Static_assert(ARRAY_SIZE(mtk_i2c_bus_controller) == I2C_BUS_NUMBER,
 	       "Wrong size of mtk_i2c_bus_controller");
 
-struct pad_func {
-	gpio_t gpio;
-	u8 func;
-};
-
-#define PAD_FUNC(name, func) {GPIO(name), PAD_##name##_FUNC_##func}
-
 static const struct pad_func i2c_funcs[I2C_BUS_NUMBER][2] = {
 	{
-		PAD_FUNC(SDA0, SDA0),
-		PAD_FUNC(SCL0, SCL0),
+		PAD_FUNC_UP(SDA0, SDA0),
+		PAD_FUNC_UP(SCL0, SCL0),
 	},
 	{
-		PAD_FUNC(SDA1, SDA1),
-		PAD_FUNC(SCL1, SCL1),
+		PAD_FUNC_UP(SDA1, SDA1),
+		PAD_FUNC_UP(SCL1, SCL1),
 	},
 	{
-		PAD_FUNC(SDA2, SDA2),
-		PAD_FUNC(SCL2, SCL2),
+		PAD_FUNC_UP(SDA2, SDA2),
+		PAD_FUNC_UP(SCL2, SCL2),
 	},
 	{
-		PAD_FUNC(SDA3, SDA3),
-		PAD_FUNC(SCL3, SCL3),
+		PAD_FUNC_UP(SDA3, SDA3),
+		PAD_FUNC_UP(SCL3, SCL3),
 	},
 	{
-		PAD_FUNC(SDA4, SDA4),
-		PAD_FUNC(SCL4, SCL4),
+		PAD_FUNC_UP(SDA4, SDA4),
+		PAD_FUNC_UP(SCL4, SCL4),
 	},
 	{
-		PAD_FUNC(SDA5, SDA5),
-		PAD_FUNC(SCL5, SCL5),
+		PAD_FUNC_UP(SDA5, SDA5),
+		PAD_FUNC_UP(SCL5, SCL5),
 	},
 	{
-		PAD_FUNC(SDA6, SDA6),
-		PAD_FUNC(SCL6, SCL6),
+		PAD_FUNC_UP(SDA6, SDA6),
+		PAD_FUNC_UP(SCL6, SCL6),
 	},
 };
 
@@ -98,7 +91,7 @@ static void mtk_i2c_set_gpio_pinmux(uint8_t bus)
 	const struct pad_func *ptr = i2c_funcs[bus];
 	for (size_t i = 0; i < 2; i++) {
 		gpio_set_mode(ptr[i].gpio, ptr[i].func);
-		gpio_set_pull(ptr[i].gpio, GPIO_PULL_ENABLE, GPIO_PULL_UP);
+		gpio_set_pull(ptr[i].gpio, GPIO_PULL_ENABLE, ptr[i].select);
 	}
 }
 
diff --git a/src/soc/mediatek/mt8183/spi.c b/src/soc/mediatek/mt8183/spi.c
index 9404f93c13..bf1b3b5a1c 100644
--- a/src/soc/mediatek/mt8183/spi.c
+++ b/src/soc/mediatek/mt8183/spi.c
@@ -35,58 +35,50 @@ struct mtk_spi_bus spi_bus[SPI_BUS_NUMBER] = {
 	}
 };
 
-struct pad_func {
-	u8 pin_id;
-	u8 func;
-};
-
-#define PAD_FUNC(name, func) {PAD_##name##_ID, PAD_##name##_FUNC_##func}
-#define PAD_FUNC_GPIO(name) {PAD_##name##_ID, 0}
-
 static const struct pad_func pad0_funcs[SPI_BUS_NUMBER][4] = {
 	{
-		PAD_FUNC(SPI_MI, SPI0_MI),
+		PAD_FUNC_DOWN(SPI_MI, SPI0_MI),
 		PAD_FUNC_GPIO(SPI_CSB),
-		PAD_FUNC(SPI_MO, SPI0_MO),
-		PAD_FUNC(SPI_CLK, SPI0_CLK),
+		PAD_FUNC_DOWN(SPI_MO, SPI0_MO),
+		PAD_FUNC_DOWN(SPI_CLK, SPI0_CLK),
 	},
 	{
-		PAD_FUNC(SPI1_MI, SPI1_A_MI),
+		PAD_FUNC_DOWN(SPI1_MI, SPI1_A_MI),
 		PAD_FUNC_GPIO(SPI1_CSB),
-		PAD_FUNC(SPI1_MO, SPI1_A_MO),
-		PAD_FUNC(SPI1_CLK, SPI1_A_CLK),
+		PAD_FUNC_DOWN(SPI1_MO, SPI1_A_MO),
+		PAD_FUNC_DOWN(SPI1_CLK, SPI1_A_CLK),
 	},
 	{
-		PAD_FUNC(KPCOL1, SPI2_MI),
+		PAD_FUNC_DOWN(KPCOL1, SPI2_MI),
 		PAD_FUNC_GPIO(EINT0),
-		PAD_FUNC(EINT1, SPI2_MO),
-		PAD_FUNC(EINT2, SPI2_CLK),
+		PAD_FUNC_DOWN(EINT1, SPI2_MO),
+		PAD_FUNC_DOWN(EINT2, SPI2_CLK),
 	},
 	{
-		PAD_FUNC(DPI_D8, SPI3_MI),
+		PAD_FUNC_DOWN(DPI_D8, SPI3_MI),
 		PAD_FUNC_GPIO(DPI_D9),
-		PAD_FUNC(DPI_D10, SPI3_MO),
-		PAD_FUNC(DPI_D11, SPI3_CLK),
+		PAD_FUNC_DOWN(DPI_D10, SPI3_MO),
+		PAD_FUNC_DOWN(DPI_D11, SPI3_CLK),
 	},
 	{
-		PAD_FUNC(DPI_D4, SPI4_MI),
+		PAD_FUNC_DOWN(DPI_D4, SPI4_MI),
 		PAD_FUNC_GPIO(DPI_D5),
-		PAD_FUNC(DPI_D6, SPI4_MO),
-		PAD_FUNC(DPI_D7, SPI4_CLK),
+		PAD_FUNC_DOWN(DPI_D6, SPI4_MO),
+		PAD_FUNC_DOWN(DPI_D7, SPI4_CLK),
 	},
 	{
-		PAD_FUNC(DPI_D0, SPI5_MI),
+		PAD_FUNC_DOWN(DPI_D0, SPI5_MI),
 		PAD_FUNC_GPIO(DPI_D1),
-		PAD_FUNC(DPI_D2, SPI5_MO),
-		PAD_FUNC(DPI_D3, SPI5_CLK),
+		PAD_FUNC_DOWN(DPI_D2, SPI5_MO),
+		PAD_FUNC_DOWN(DPI_D3, SPI5_CLK),
 	}
 };
 
 static const struct pad_func bus1_pad1_funcs[4] = {
-	PAD_FUNC(EINT7, SPI1_B_MI),
+	PAD_FUNC_DOWN(EINT7, SPI1_B_MI),
 	PAD_FUNC_GPIO(EINT8),
-	PAD_FUNC(EINT9, SPI1_B_MO),
-	PAD_FUNC(EINT10, SPI1_B_CLK),
+	PAD_FUNC_DOWN(EINT9, SPI1_B_MO),
+	PAD_FUNC_DOWN(EINT10, SPI1_B_CLK),
 };
 
 void mtk_spi_set_gpio_pinmux(unsigned int bus, enum spi_pad_mask pad_select)
@@ -100,7 +92,7 @@ void mtk_spi_set_gpio_pinmux(unsigned int bus, enum spi_pad_mask pad_select)
 		ptr = bus1_pad1_funcs;
 	}
 	for (int i = 0; i < 4; i++)
-		gpio_set_mode((gpio_t){.id = ptr[i].pin_id}, ptr[i].func);
+		gpio_set_mode(ptr[i].gpio, ptr[i].func);
 }
 
 const struct spi_ctrlr_buses spi_ctrlr_bus_map[] = {