Change in coreboot[master]: google/kahlee/variants/(kahlee/baseboard)/gpio.c: Convert GPIO table
Richard Spiegel has uploaded this change for review. ( https://review.coreboot.org/22988
Change subject: google/kahlee/variants/(kahlee/baseboard)/gpio.c: Convert GPIO table ......................................................................
google/kahlee/variants/(kahlee/baseboard)/gpio.c: Convert GPIO table
Fill up the dummy gpio_set_stage[] with data from agesa_board_gpios[], convert format and delete agesa_board_gpios[] and get_gpio_table(). Then remove the get_gpio_table() call from BiosCallOuts.c. Finally, remove get_gpio_table() from google/kahlee/variants/baseboard/include/baseboard/variants.h.
BUG=b:64140392 TEST=Build grunt. Build and boot kahlee, recording serial output. Search for "Stage reset" and "Stage init late"; verify that GPIO are programmed at the correct stage. As only bits 23-17 are changed by the program, verify that occasionally some other bits are set, indicating that it's actually a register read back after being programed.
Change-Id: I88bf2c855105a6bc458aedfc6da7725662695667 Signed-off-by: Richard Spiegel richard.spiegel@silverbackltd.com --- M src/mainboard/google/kahlee/BiosCallOuts.c M src/mainboard/google/kahlee/variants/baseboard/gpio.c M src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h M src/mainboard/google/kahlee/variants/kahlee/gpio.c 4 files changed, 95 insertions(+), 134 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/88/22988/1
diff --git a/src/mainboard/google/kahlee/BiosCallOuts.c b/src/mainboard/google/kahlee/BiosCallOuts.c index 1c0df4d..fafe0aa 100644 --- a/src/mainboard/google/kahlee/BiosCallOuts.c +++ b/src/mainboard/google/kahlee/BiosCallOuts.c @@ -21,13 +21,10 @@
void platform_FchParams_reset(FCH_RESET_DATA_BLOCK *FchParams_reset) { - FchParams_reset->EarlyOemGpioTable = (void *)get_gpio_table(); }
void platform_FchParams_env(FCH_DATA_BLOCK *FchParams_env) { - FchParams_env->PostOemGpioTable = (void *)get_gpio_table(); - /* SDHCI/MMC configuration */ if (IS_ENABLED(CONFIG_BOARD_GOOGLE_KAHLEE)) FchParams_env->Sd.SdSlotType = 1; // EMMC diff --git a/src/mainboard/google/kahlee/variants/baseboard/gpio.c b/src/mainboard/google/kahlee/variants/baseboard/gpio.c index 35b35d1..79de6eb 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/gpio.c +++ b/src/mainboard/google/kahlee/variants/baseboard/gpio.c @@ -41,141 +41,132 @@ const static struct soc_amd_stoneyridge_gpio gpio_set_stage[] = {
/* GPIO_0 - EC_PCH_PWR_BTN_ODL */ - { GPIO_0, Function0, PULL_UP | INPUT, STAGE_RESET } -}; - -/* - * These settings were generated by a spreadsheet. If they need to be updated, - * update the spreadsheet shared with the Grunt development team. - */ -static const GPIO_CONTROL agesa_board_gpios[] = { - - /* GPIO_0 - EC_PCH_PWR_BTN_ODL */ - { GPIO_0, Function0, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_0, Function0, PULL_UP | INPUT, STAGE_RESET },
/* GPIO_1 - SYS_RST_ODL */ - { GPIO_1, Function0, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_1, Function0, PULL_UP | INPUT, STAGE_RESET },
/* GPIO_2 - WLAN_PCIE_WAKE_3V3_ODL */ - { GPIO_2, Function0, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_2, Function0, PULL_UP | INPUT, STAGE_INIT_LATE },
/* GPIO_3 - MEM_VOLT_SEL */ - { GPIO_3, Function0, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_3, Function0, PULL_UP | INPUT, STAGE_RESET },
/* GPIO_4 - EN_PP3300_WLAN */ - { GPIO_4, Function0, FCH_GPIO_OUTPUT_VALUE | FCH_GPIO_OUTPUT_ENABLE }, + { GPIO_4, Function0, OUTPUT_H, STAGE_INIT_LATE },
/* GPIO_5 - PCH_TRACKPAD_INT_3V3_ODL, SCI */ - { GPIO_5, Function0, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_5, Function0, PULL_UP | INPUT, STAGE_RESET },
/* GPIO_6 - APU_RST_L / EC_SMI_ODL, SMI */ - { GPIO_6, Function0, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_6, Function0, PULL_UP | INPUT, STAGE_RESET },
/* GPIO_7 - APU_PWROK_OD (currently not used) */ - { GPIO_7, Function0, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_7, Function0, PULL_UP | INPUT, STAGE_RESET },
/* GPIO_8 - DDR_ALERT_3V3_L (currently not used) */ - { GPIO_8, Function0, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_8, Function0, PULL_UP | INPUT, STAGE_RESET },
/* GPIO_9 - H1_PCH_INT_ODL, SCI */ - { GPIO_9, Function0, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_9, Function0, PULL_UP | INPUT, STAGE_RESET },
/* GPIO_10 - SLP_S0_L (currently not used) */ - { GPIO_10, Function0, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_10, Function0, PULL_UP | INPUT, STAGE_INIT_LATE },
/* GPIO_11 - TOUCHSCREEN_INT_3V3_ODL, SCI */ - { GPIO_11, Function0, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_11, Function0, PULL_UP | INPUT, STAGE_RESET },
/* GPIO_12 - Unused (TP126) */ - { GPIO_12, Function2, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_12, Function2, PULL_UP | INPUT, STAGE_INIT_LATE },
/* GPIO_13 - APU_PEN_PDCT_ODL (currently not used) */ - { GPIO_13, Function1, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_13, Function1, PULL_UP | INPUT, STAGE_INIT_LATE },
/* GPIO_14 - APU_HP_INT_ODL, SCI */ - { GPIO_14, Function1, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_14, Function1, PULL_UP | INPUT, STAGE_RESET },
/* GPIO_15 - EC_IN_RW_OD */ - { GPIO_15, Function1, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_15, Function1, PULL_UP | INPUT, STAGE_RESET },
/* GPIO_16 - USB_C0_OC_L */ - { GPIO_16, Function0, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_16, Function0, PULL_UP | INPUT, STAGE_INIT_LATE },
/* GPIO_17 - USB_C1_OC_L */ - { GPIO_17, Function0, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_17, Function0, PULL_UP | INPUT, STAGE_INIT_LATE },
/* GPIO_18 - USB_A0_OC_ODL */ - { GPIO_18, Function0, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_18, Function0, PULL_UP | INPUT, STAGE_INIT_LATE },
/* GPIO_19 - APU_I2C_SCL3 (Touchscreen) */ - { GPIO_19, Function1, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_19, Function1, PULL_UP | INPUT, STAGE_RESET },
/* GPIO_20 - APU_I2C_SDA3 (Touchscreen) */ - { GPIO_20, Function1, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_20, Function1, PULL_UP | INPUT, STAGE_RESET },
/* GPIO_21 - APU_PEN_INT_ODL, SCI */ - { GPIO_21, Function1, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_21, Function1, PULL_UP | INPUT, STAGE_RESET },
/* GPIO_22 - EC_SCI_ODL, SCI */ - { GPIO_22, Function1, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_22, Function1, PULL_UP | INPUT, STAGE_RESET },
/* GPIO_23 - ACOK_OD */ + /* GPIO_24 - USB_A1_OC_ODL */ - { GPIO_24, Function0, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_24, Function0, PULL_UP | INPUT, STAGE_RESET },
/* GPIO_25 - SD_CD */ - { GPIO_25, Function0, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_25, Function0, PULL_UP | INPUT, STAGE_RESET },
/* GPIO_26 - APU_PCIE_RST_L */ - { GPIO_26, Function0, }, + { GPIO_26, Function0, INPUT, STAGE_RESET },
/* GPIO_40 - EMMC_BRIDGE_RST_L */ - { GPIO_40, Function0, FCH_GPIO_OUTPUT_VALUE | FCH_GPIO_OUTPUT_ENABLE }, + { GPIO_40, Function0, OUTPUT_H, STAGE_RESET },
/* GPIO_42 - S5_MUX_CTRL */ - { GPIO_42, Function0, FCH_GPIO_OUTPUT_VALUE | FCH_GPIO_OUTPUT_ENABLE }, + { GPIO_42, Function0, OUTPUT_H, STAGE_RESET },
/* GPIO_67 - PEN_RESET */ - { GPIO_67, Function0, FCH_GPIO_OUTPUT_VALUE }, + { GPIO_67, Function0, FCH_GPIO_OUTPUT_VALUE, STAGE_INIT_LATE },
/* GPIO_70 - WLAN_PE_RST_L */ - { GPIO_70, Function0, FCH_GPIO_OUTPUT_VALUE | FCH_GPIO_OUTPUT_ENABLE }, + { GPIO_70, Function0, OUTPUT_H, STAGE_INIT_LATE },
/* GPIO_74 - LPC_CLK0_EC_R */ - { GPIO_74, Function0, FCH_GPIO_PULL_DOWN_ENABLE }, + { GPIO_74, Function0, PULL_DOWN | INPUT, STAGE_RESET },
/* GPIO_75 - Unused (strap) (R139/R130) */ - { GPIO_75, Function1, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_75, Function1, PULL_UP | INPUT, STAGE_INIT_LATE },
/* GPIO_76 - EN_PP3300_TOUCHSCREEN */ - { GPIO_76, Function0, FCH_GPIO_OUTPUT_VALUE | FCH_GPIO_OUTPUT_ENABLE }, + { GPIO_76, Function0, OUTPUT_H, STAGE_INIT_LATE },
/* GPIO_84 - HUB_RST (Active High) */ - { GPIO_84, Function1, FCH_GPIO_OUTPUT_VALUE }, + { GPIO_84, Function1, FCH_GPIO_OUTPUT_VALUE, STAGE_RESET },
/* GPIO_85 - TOUCHSCREEN_RST (Active High) */ - { GPIO_85, Function1, FCH_GPIO_OUTPUT_VALUE }, + { GPIO_85, Function1, FCH_GPIO_OUTPUT_VALUE, STAGE_RESET },
/* GPIO_86 - Unused (TP109) */ - { GPIO_86, Function1, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_86, Function1, PULL_UP | INPUT, STAGE_INIT_LATE },
/* GPIO_87 - LPC_SERIRQ */ - { GPIO_87, Function0, }, + { GPIO_87, Function0, INPUT, STAGE_RESET },
/* GPIO_88 - LPC_CLKRUN_L */ - { GPIO_88, Function0, }, + { GPIO_88, Function0, INPUT, STAGE_RESET },
/* GPIO_90 - EN_PP3300_CAMERA */ - { GPIO_90, Function0, FCH_GPIO_OUTPUT_VALUE | FCH_GPIO_OUTPUT_ENABLE }, + { GPIO_90, Function0, OUTPUT_H, STAGE_INIT_LATE },
/* GPIO_91 - EN_PP3300_TRACKPAD */ - { GPIO_91, Function1, FCH_GPIO_OUTPUT_VALUE | FCH_GPIO_OUTPUT_ENABLE }, + { GPIO_91, Function1, OUTPUT_H, STAGE_INIT_LATE },
/* GPIO_92 - WLAN_PCIE_CLKREQ_3V3_ODL */ - { GPIO_92, Function0, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_92, Function0, PULL_UP | INPUT, STAGE_RESET },
/* GPIO_93 - EMMC_RST_L */ - { GPIO_93, Function1, FCH_GPIO_OUTPUT_VALUE | FCH_GPIO_OUTPUT_ENABLE }, + { GPIO_93, Function1, OUTPUT_H, STAGE_RESET },
/* GPIO_95 - SD_CLK */ /* GPIO_96 - SD_CMD */ @@ -185,105 +176,98 @@ /* GPIO_100 - SD_D3 */
/* GPIO_101 - SD_WP_L */ - { GPIO_101, Function0, FCH_GPIO_PULL_DOWN_ENABLE }, + { GPIO_101, Function0, PULL_DOWN | INPUT, STAGE_RESET },
/* GPIO_102 - EN_SD_SOCKET_PWR */ - { GPIO_102, Function0, FCH_GPIO_PULL_DOWN_ENABLE }, + { GPIO_102, Function0, PULL_DOWN | INPUT, STAGE_INIT_LATE },
/* GPIO_113 - APU_I2C_SCL2 (Pen & Trackpad) */ - { GPIO_113, Function1, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_113, Function1, PULL_UP | INPUT, STAGE_INIT_LATE },
/* GPIO_114 - APU_I2C_SDA2 (Pen & Trackpad) */ - { GPIO_114, Function1, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_114, Function1, PULL_UP | INPUT, STAGE_INIT_LATE },
/* GPIO_115 - Unused (TP127) */ - { GPIO_115, Function1, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_115, Function1, PULL_UP | INPUT, STAGE_INIT_LATE },
/* GPIO_116 - PCIE_EMMC_CLKREQ_L */ - { GPIO_116, Function0, }, + { GPIO_116, Function0, INPUT, STAGE_RESET },
/* GPIO_117 - PCH_SPI_CLK_R */
/* GPIO_118 - PCH_SPI_CS0_L */ - { GPIO_118, Function0, }, + { GPIO_118, Function0, INPUT, STAGE_RESET },
/* GPIO_119 - SPK_PA_EN */ - { GPIO_119, Function2, FCH_GPIO_OUTPUT_VALUE | FCH_GPIO_OUTPUT_ENABLE }, + { GPIO_119, Function2, OUTPUT_H, STAGE_RESET },
/* GPIO_120 - PCH_SPI_MISO */ /* GPIO_121 - PCH_SPI_MOSI */
/* GPIO_122 - APU_BIOS_FLASH_WP_L */ - { GPIO_122, Function1, }, + { GPIO_122, Function1, INPUT, STAGE_RESET },
/* GPIO_126 - DMIC_CLK2_EN */ - { GPIO_126, Function1, FCH_GPIO_OUTPUT_VALUE | FCH_GPIO_OUTPUT_ENABLE }, + { GPIO_126, Function1, OUTPUT_H, STAGE_RESET },
/* GPIO_129 - APU_KBRST_L */ - { GPIO_129, Function0, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_129, Function0, PULL_UP | INPUT, STAGE_RESET },
/* GPIO_130 - Unused (TP55) */ - { GPIO_130, Function1, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_130, Function1, PULL_UP | INPUT, STAGE_INIT_LATE },
/* GPIO_131 - CONFIG_STRAP3 */ - { GPIO_131, Function3, }, + { GPIO_131, Function3, INPUT, STAGE_RESET },
/* GPIO_132 - CONFIG_STRAP4 */ - { GPIO_132, Function2, }, + { GPIO_132, Function2, INPUT, STAGE_RESET },
/* GPIO_133 - APU_EDP_BKLTEN_L (backlight - Active LOW) */ - { GPIO_133, Function1, FCH_GPIO_OUTPUT_VALUE }, + { GPIO_133, Function1, FCH_GPIO_OUTPUT_VALUE, STAGE_RESET },
/* GPIO_135 - Unused (TP128) */ - { GPIO_135, Function1, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_135, Function1, PULL_UP | INPUT, STAGE_INIT_LATE },
/* GPIO_136 - UART_PCH_RX_DEBUG_TX */ - { GPIO_136, Function0, }, + { GPIO_136, Function0, INPUT, STAGE_RESET },
/* GPIO_137 - AUDIO_CLK_EN (Remove in EVT?) */ - { GPIO_137, Function1, FCH_GPIO_OUTPUT_VALUE | FCH_GPIO_OUTPUT_ENABLE }, + { GPIO_137, Function1, OUTPUT_H, STAGE_RESET },
/* GPIO_138 - UART_PCH_TX_DEBUG_RX */ - { GPIO_138, Function0, }, + { GPIO_138, Function0, INPUT, STAGE_RESET },
/* GPIO_139 - CONFIG_STRAP1 */ - { GPIO_139, Function1, }, + { GPIO_139, Function1, INPUT, STAGE_RESET },
/* GPIO_140 - I2S_BCLK_R (init to func0, used for I2S) */ - { GPIO_140, Function0, }, + { GPIO_140, Function0, INPUT, STAGE_RESET },
/* GPIO_141 - I2S2_DATA_MIC2 (init to func0, used for I2S) */ - { GPIO_141, Function0, }, + { GPIO_141, Function0, INPUT, STAGE_RESET },
/* GPIO_142 - CONFIG_STRAP2 */ - { GPIO_142, Function1, }, + { GPIO_142, Function1, INPUT, STAGE_RESET },
/* GPIO_143 - I2S2_DATA (init to func0, used for I2S) */ - { GPIO_143, Function0, }, + { GPIO_143, Function0, INPUT, STAGE_RESET },
/* GPIO_144 - I2S_LR_R (init to func0, used for I2S) */ - { GPIO_144, Function0, }, + { GPIO_144, Function0, INPUT, STAGE_RESET },
/* GPIO_145 - PCH_I2C_AUDIO_SCL */ - { GPIO_145, Function0, }, + { GPIO_145, Function0, INPUT, STAGE_RESET },
/* GPIO_146 - PCH_I2C_AUDIO_SDA */ - { GPIO_146, Function0, }, + { GPIO_146, Function0, INPUT, STAGE_RESET },
/* GPIO_147 - PCH_I2C_HUB_SCL */ - { GPIO_147, Function0, }, + { GPIO_147, Function0, INPUT, STAGE_RESET },
/* GPIO_148 - PCH_I2C_HUB_SDA */ - { GPIO_148, Function0, }, - - {-1} + { GPIO_148, Function0, INPUT, STAGE_RESET }, };
-const __attribute__((weak)) GPIO_CONTROL *get_gpio_table(void) -{ - return agesa_board_gpios; -} - const __attribute__((weak)) const struct soc_amd_stoneyridge_gpio *board_get_gpio(size_t *size) { diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h index 9c54794..bf14ef4 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h @@ -21,7 +21,6 @@ #include <soc/smi.h> #include <amdblocks/agesawrapper.h>
-const GPIO_CONTROL *get_gpio_table(void); const struct sci_source *get_gpe_table(size_t *num); uint8_t variant_memory_sku(void); int variant_mainboard_read_spd(uint8_t spdAddress, char *buf, size_t len); diff --git a/src/mainboard/google/kahlee/variants/kahlee/gpio.c b/src/mainboard/google/kahlee/variants/kahlee/gpio.c index 8d76ee9..8eceb24 100644 --- a/src/mainboard/google/kahlee/variants/kahlee/gpio.c +++ b/src/mainboard/google/kahlee/variants/kahlee/gpio.c @@ -37,93 +37,74 @@ */ const struct soc_amd_stoneyridge_gpio gpio_set_stage[] = { /* AGPIO2, to become event generator */ - { GPIO_2, Function1, PULL_UP | INPUT, STAGE_RESET } -}; + { GPIO_2, Function1, PULL_UP | INPUT, STAGE_RESET },
-static const GPIO_CONTROL agesa_board_gpios[] = { - /* AGPIO2 PCIE/WLAN WAKE# SCI*/ - {2, Function1, FCH_GPIO_PULL_UP_ENABLE }, + /* SER_TX */ + { GPIO_8, Function1, PULL_UP | OUTPUT_H, STAGE_RESET },
- /* SER TX */ - {8, Function1, FCH_GPIO_PULL_UP_ENABLE | FCH_GPIO_OUTPUT_VALUE - | FCH_GPIO_OUTPUT_ENABLE}, /* SER RX */ - {9, Function1, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_9, Function1, PULL_UP | INPUT, STAGE_RESET },
/* AGPIO 12 */ - {12, Function2, FCH_GPIO_PULL_UP_ENABLE }, + { GPIO_12, Function2, PULL_UP | INPUT, STAGE_INIT_LATE },
/* TS_EN_SOC (TouchScreen enable GPIO) */ - {13, Function1, FCH_GPIO_PULL_UP_ENABLE | FCH_GPIO_OUTPUT_VALUE - | FCH_GPIO_OUTPUT_ENABLE}, + {GPIO_13, Function1, PULL_UP | OUTPUT_H, STAGE_INIT_LATE },
/* CAM_PWRON (Camera enable GPIO) */ - {14, Function1, FCH_GPIO_PULL_UP_ENABLE | FCH_GPIO_OUTPUT_VALUE - | FCH_GPIO_OUTPUT_ENABLE}, + {GPIO_14, Function1, PULL_UP | OUTPUT_H, STAGE_INIT_LATE },
/* EC_IN_RW */ - {15, Function1, FCH_GPIO_PULL_UP_ENABLE }, + {GPIO_15, Function1, PULL_UP | INPUT, STAGE_RESET },
/* APU_I2C_3_SCL */ - {19, Function1, FCH_GPIO_PULL_UP_ENABLE }, + {GPIO_19, Function1, PULL_UP | INPUT, STAGE_RESET },
/* APU_I2C_3_SDA */ - {20, Function1, FCH_GPIO_PULL_UP_ENABLE }, + {GPIO_20, Function1, PULL_UP | INPUT, STAGE_RESET },
/* AGPIO22 EC_SCI */ - {22, Function1, FCH_GPIO_PULL_UP_ENABLE }, + {GPIO_22, Function1, PULL_UP | INPUT, STAGE_RESET },
/* APU_BT_ON# */ - {24, Function1, FCH_GPIO_PULL_UP_ENABLE | FCH_GPIO_OUTPUT_VALUE - | FCH_GPIO_OUTPUT_ENABLE}, + {GPIO_24, Function1, PULL_UP | OUTPUT_H, STAGE_INIT_LATE },
/* DEVSLP1_SSD */ - {67, Function1, FCH_GPIO_PULL_UP_ENABLE}, + {67, Function1, PULL_UP | INPUT, STAGE_INIT_LATE },
/* DEVSLP1_EMMC */ /* No Connect for now. - * {70, Function1, FCH_GPIO_PULL_UP_ENABLE}, + * {GPIO_70, Function1, PULL_UP | INPUT, STAGE_INIT_LATE}, */
/* SPI_TPM_CS_L */ - {76, Function1, FCH_GPIO_PULL_DOWN_ENABLE | FCH_GPIO_OUTPUT_VALUE - | FCH_GPIO_OUTPUT_ENABLE}, + {GPIO_76, Function1, PULL_DOWN | OUTPUT_H, STAGE_RESET },
/* CAM_LED# */ - {84, Function1, FCH_GPIO_PULL_UP_ENABLE | FCH_GPIO_OUTPUT_VALUE - | FCH_GPIO_OUTPUT_ENABLE}, + {GPIO_84, Function1, PULL_UP | OUTPUT_H, STAGE_INIT_LATE },
/* TS_RST# (TouchScreen Reset) */ - {85, Function1, FCH_GPIO_PULL_UP_ENABLE | FCH_GPIO_OUTPUT_VALUE - | FCH_GPIO_OUTPUT_ENABLE}, + {GPIO_85, Function1, PULL_UP | OUTPUT_H, STAGE_INIT_LATE },
/* WLAN_RST#_AUX */ - {119, Function2, FCH_GPIO_PULL_UP_ENABLE | FCH_GPIO_OUTPUT_VALUE - | FCH_GPIO_OUTPUT_ENABLE}, + {GPIO_119, Function2, PULL_UP | OUTPUT_H, STAGE_INIT_LATE },
/* BD_ID1 */ - {135, Function1, 0 }, + {GPIO_135, Function1, INPUT, STAGE_RESET },
/* TPM_SERIRQ# */ - {139, Function1, FCH_GPIO_PULL_UP_ENABLE }, + {GPIO_139, Function1, PULL_UP | INPUT, STAGE_RESET },
/* BD_ID2 */ - {140, Function1, 0 }, + {GPIO_140, Function1, INPUT, STAGE_RESET },
/* APU_SPI_WP */ - {142, Function1, FCH_GPIO_PULL_UP_ENABLE }, + {GPIO_142, Function1, PULL_UP | INPUT, STAGE_RESET },
/* BD_ID3 */ - {144, Function1, 0 }, - - {-1} + {GPIO_144, Function1, INPUT, STAGE_RESET } };
-const GPIO_CONTROL *get_gpio_table(void) -{ - return agesa_board_gpios; -} - const struct soc_amd_stoneyridge_gpio *board_get_gpio(size_t *size) { *size = ARRAY_SIZE(gpio_set_stage);
-
Richard Spiegel (Code Review)