GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/google/auron/var/buddy: Switch to Lynxpoint GPIO macros 

Prepare to unify Lynxpoint LP and Broadwell GPIO code.

Tested with BUILD_TIMELESS=1, Google Buddy remains identical.

Change-Id: I6e6256a9cc88c9d0743150bfdf12b1b482fe157d
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50070
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Angel Pons 2021-01-28 16:41:35 +01:00 committed by Patrick Georgi
parent 6259aeb86e
commit d1ff7e43b5
2 changed files with 102 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

194
src/mainboard/google/auron/variants/buddy/gpio.c
View File

@ -1,102 +1,102 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <soc/gpio.h> #include <southbridge/intel/lynxpoint/lp_gpio.h>
const struct pch_lp_gpio_map mainboard_gpio_map[] = { const struct pch_lp_gpio_map mainboard_gpio_map[] = {
PCH_GPIO_UNUSED, /* 0: UNUSED */ LP_GPIO_UNUSED, /* 0: UNUSED */
PCH_GPIO_UNUSED, /* 1: UNUSED */ LP_GPIO_UNUSED, /* 1: UNUSED */
PCH_GPIO_UNUSED, /* 2: UNUSED */ LP_GPIO_UNUSED, /* 2: UNUSED */
PCH_GPIO_UNUSED, /* 3: UNUSED */ LP_GPIO_UNUSED, /* 3: UNUSED */
PCH_GPIO_NATIVE, /* 4: NATIVE: I2C0_SDA_GPIO4 */ LP_GPIO_NATIVE, /* 4: NATIVE: I2C0_SDA_GPIO4 */
PCH_GPIO_NATIVE, /* 5: NATIVE: I2C0_SCL_GPIO5 */ LP_GPIO_NATIVE, /* 5: NATIVE: I2C0_SCL_GPIO5 */
PCH_GPIO_NATIVE, /* 6: NATIVE: I2C1_SDA_GPIO6 */ LP_GPIO_NATIVE, /* 6: NATIVE: I2C1_SDA_GPIO6 */
PCH_GPIO_NATIVE, /* 7: NATIVE: I2C1_SCL_GPIO7 */ LP_GPIO_NATIVE, /* 7: NATIVE: I2C1_SCL_GPIO7 */
PCH_GPIO_ACPI_SCI, /* 8: LAN_WAKE_L_Q */ LP_GPIO_ACPI_SCI, /* 8: LAN_WAKE_L_Q */
PCH_GPIO_OUT_HIGH, /* 9: PP3300_WLAN_EN */ LP_GPIO_OUT_HIGH, /* 9: PP3300_WLAN_EN */
PCH_GPIO_ACPI_SCI, /* 10: WLAN_WAKE_L_Q */ LP_GPIO_ACPI_SCI, /* 10: WLAN_WAKE_L_Q */
PCH_GPIO_UNUSED, /* 11: SMBALERT */ LP_GPIO_UNUSED, /* 11: SMBALERT */
PCH_GPIO_INPUT_INVERT, /* 12: RECOVERY_L */ LP_GPIO_INPUT_INVERT, /* 12: RECOVERY_L */
PCH_GPIO_OUT_HIGH, /* 13: BT_DISABLE_L */ LP_GPIO_OUT_HIGH, /* 13: BT_DISABLE_L */
PCH_GPIO_INPUT, /* 14: EC_IN_RW */ LP_GPIO_INPUT, /* 14: EC_IN_RW */
PCH_GPIO_UNUSED, /* 15: UNUSED (STRAP) */ LP_GPIO_UNUSED, /* 15: UNUSED (STRAP) */
PCH_GPIO_UNUSED, /* 16: UNUSED */ LP_GPIO_UNUSED, /* 16: UNUSED */
PCH_GPIO_OUT_HIGH, /* 17: PP3300_VP8_EN */ LP_GPIO_OUT_HIGH, /* 17: PP3300_VP8_EN */
PCH_GPIO_UNUSED, /* 18: UNUSED */ LP_GPIO_UNUSED, /* 18: UNUSED */
PCH_GPIO_UNUSED, /* 19: UNUSED */ LP_GPIO_UNUSED, /* 19: UNUSED */
PCH_GPIO_NATIVE, /* 20: NATIVE: CLK_PCIE_REQ2# */ LP_GPIO_NATIVE, /* 20: NATIVE: CLK_PCIE_REQ2# */
PCH_GPIO_NATIVE, /* 21: NATIVE: CLK_PCIE_REQ3# */ LP_GPIO_NATIVE, /* 21: NATIVE: CLK_PCIE_REQ3# */
PCH_GPIO_NATIVE, /* 22: NATIVE: CLK_PCIE_REQ4# */ LP_GPIO_NATIVE, /* 22: NATIVE: CLK_PCIE_REQ4# */
PCH_GPIO_UNUSED, /* 23: UNUSED */ LP_GPIO_UNUSED, /* 23: UNUSED */
PCH_GPIO_OUT_HIGH, /* 24: WLAN_OFF_L */ LP_GPIO_OUT_HIGH, /* 24: WLAN_OFF_L */
PCH_GPIO_INPUT_INVERT, /* 25: TOUCH_INT_L (WAKE) */ LP_GPIO_INPUT_INVERT, /* 25: TOUCH_INT_L (WAKE) */
PCH_GPIO_OUT_HIGH, /* 26: USB_CTL_1 */ LP_GPIO_OUT_HIGH, /* 26: USB_CTL_1 */
PCH_GPIO_UNUSED, /* 27: UNUSED */ LP_GPIO_UNUSED, /* 27: UNUSED */
PCH_GPIO_OUT_LOW, /* 28: USB_ILIM_SEL */ LP_GPIO_OUT_LOW, /* 28: USB_ILIM_SEL */
PCH_GPIO_UNUSED, /* 29: UNUSED */ LP_GPIO_UNUSED, /* 29: UNUSED */
PCH_GPIO_NATIVE, /* 30: NATIVE: PCH_SUSPWRACK_L */ LP_GPIO_NATIVE, /* 30: NATIVE: PCH_SUSPWRACK_L */
PCH_GPIO_NATIVE, /* 31: NATIVE: PCH_ACPRESENT */ LP_GPIO_NATIVE, /* 31: NATIVE: PCH_ACPRESENT */
PCH_GPIO_NATIVE, /* 32: NATIVE: CLKRUN# */ LP_GPIO_NATIVE, /* 32: NATIVE: CLKRUN# */
PCH_GPIO_NATIVE, /* 33: NATIVE: DEVSLP0 */ LP_GPIO_NATIVE, /* 33: NATIVE: DEVSLP0 */
PCH_GPIO_ACPI_SMI, /* 34: EC_SMI_L */ LP_GPIO_ACPI_SMI, /* 34: EC_SMI_L */
PCH_GPIO_ACPI_SMI, /* 35: PCH_NMI_DBG_L (route in NMI_EN) */ LP_GPIO_ACPI_SMI, /* 35: PCH_NMI_DBG_L (route in NMI_EN) */
PCH_GPIO_ACPI_SCI, /* 36: EC_SCI_L */ LP_GPIO_ACPI_SCI, /* 36: EC_SCI_L */
PCH_GPIO_UNUSED, /* 37: UNUSED */ LP_GPIO_UNUSED, /* 37: UNUSED */
PCH_GPIO_UNUSED, /* 38: UNUSED */ LP_GPIO_UNUSED, /* 38: UNUSED */
PCH_GPIO_UNUSED, /* 39: UNUSED */ LP_GPIO_UNUSED, /* 39: UNUSED */
PCH_GPIO_NATIVE, /* 40: NATIVE: USB_OC0# */ LP_GPIO_NATIVE, /* 40: NATIVE: USB_OC0# */
PCH_GPIO_NATIVE, /* 41: NATIVE: USB_OC1# */ LP_GPIO_NATIVE, /* 41: NATIVE: USB_OC1# */
PCH_GPIO_NATIVE, /* 42: NATIVE: USB_OC2# */ LP_GPIO_NATIVE, /* 42: NATIVE: USB_OC2# */
PCH_GPIO_UNUSED, /* 43: UNUSED */ LP_GPIO_UNUSED, /* 43: UNUSED */
PCH_GPIO_UNUSED, /* 44: UNUSED */ LP_GPIO_UNUSED, /* 44: UNUSED */
PCH_GPIO_OUT_HIGH, /* 45: PP3300_CODEC_EN */ LP_GPIO_OUT_HIGH, /* 45: PP3300_CODEC_EN */
PCH_GPIO_UNUSED, /* 46: UNUSED */ LP_GPIO_UNUSED, /* 46: UNUSED */
PCH_GPIO_UNUSED, /* 47: UNUSED */ LP_GPIO_UNUSED, /* 47: UNUSED */
PCH_GPIO_UNUSED, /* 48: UNUSED */ LP_GPIO_UNUSED, /* 48: UNUSED */
PCH_GPIO_UNUSED, /* 49: UNUSED */ LP_GPIO_UNUSED, /* 49: UNUSED */
PCH_GPIO_OUT_HIGH, /* 50: VP8_DISABLE_L */ LP_GPIO_OUT_HIGH, /* 50: VP8_DISABLE_L */
PCH_GPIO_UNUSED, /* 51: UNUSED */ LP_GPIO_UNUSED, /* 51: UNUSED */
PCH_GPIO_UNUSED, /* 52: UNUSED */ LP_GPIO_UNUSED, /* 52: UNUSED */
PCH_GPIO_PIRQ_INVERT, /* 53: CODEC_INT */ LP_GPIO_PIRQ_INVERT, /* 53: CODEC_INT */
PCH_GPIO_PIRQ, /* 54: TOUCH_INT_L_DX */ LP_GPIO_PIRQ, /* 54: TOUCH_INT_L_DX */
PCH_GPIO_UNUSED, /* 55: UNUSED */ LP_GPIO_UNUSED, /* 55: UNUSED */
PCH_GPIO_OUT_HIGH, /* 56: USB_CHARGE_EN */ LP_GPIO_OUT_HIGH, /* 56: USB_CHARGE_EN */
PCH_GPIO_UNUSED, /* 57: UNUSED */ LP_GPIO_UNUSED, /* 57: UNUSED */
PCH_GPIO_INPUT, /* 58: PCH_SPI_WP_D */ LP_GPIO_INPUT, /* 58: PCH_SPI_WP_D */
PCH_GPIO_OUT_HIGH, /* 59: PP3300_LAN_EN */ LP_GPIO_OUT_HIGH, /* 59: PP3300_LAN_EN */
PCH_GPIO_NATIVE, /* 60: NATIVE: SMB0ALERT# */ LP_GPIO_NATIVE, /* 60: NATIVE: SMB0ALERT# */
PCH_GPIO_NATIVE, /* 61: SUS_STAT# */ LP_GPIO_NATIVE, /* 61: SUS_STAT# */
PCH_GPIO_UNUSED, /* 62: UNUSED */ LP_GPIO_UNUSED, /* 62: UNUSED */
PCH_GPIO_NATIVE, /* 63: NATIVE: PCH_SLP_S5_L */ LP_GPIO_NATIVE, /* 63: NATIVE: PCH_SLP_S5_L */
PCH_GPIO_UNUSED, /* 64: UNUSED */ LP_GPIO_UNUSED, /* 64: UNUSED */
PCH_GPIO_UNUSED, /* 65: UNUSED */ LP_GPIO_UNUSED, /* 65: UNUSED */
PCH_GPIO_UNUSED, /* 66: UNUSED (STRAP) */ LP_GPIO_UNUSED, /* 66: UNUSED (STRAP) */
PCH_GPIO_UNUSED, /* 67: UNUSED */ LP_GPIO_UNUSED, /* 67: UNUSED */
PCH_GPIO_UNUSED, /* 68: UNUSED */ LP_GPIO_UNUSED, /* 68: UNUSED */
PCH_GPIO_UNUSED, /* 69: UNUSED */ LP_GPIO_UNUSED, /* 69: UNUSED */
PCH_GPIO_UNUSED, /* 70: UNUSED */ LP_GPIO_UNUSED, /* 70: UNUSED */
PCH_GPIO_NATIVE, /* 71: NATIVE: MODPHY_EN */ LP_GPIO_NATIVE, /* 71: NATIVE: MODPHY_EN */
PCH_GPIO_UNUSED, /* 72: UNUSED */ LP_GPIO_UNUSED, /* 72: UNUSED */
PCH_GPIO_UNUSED, /* 73: UNUSED */ LP_GPIO_UNUSED, /* 73: UNUSED */
PCH_GPIO_NATIVE, /* 74: NATIVE: SMB_ME1_DAT */ LP_GPIO_NATIVE, /* 74: NATIVE: SMB_ME1_DAT */
PCH_GPIO_NATIVE, /* 75: NATIVE: SMB_ME1_CLK */ LP_GPIO_NATIVE, /* 75: NATIVE: SMB_ME1_CLK */
PCH_GPIO_UNUSED, /* 76: UNUSED */ LP_GPIO_UNUSED, /* 76: UNUSED */
PCH_GPIO_UNUSED, /* 77: UNUSED */ LP_GPIO_UNUSED, /* 77: UNUSED */
PCH_GPIO_UNUSED, /* 78: UNUSED */ LP_GPIO_UNUSED, /* 78: UNUSED */
PCH_GPIO_UNUSED, /* 79: UNUSED */ LP_GPIO_UNUSED, /* 79: UNUSED */
PCH_GPIO_UNUSED, /* 80: UNUSED */ LP_GPIO_UNUSED, /* 80: UNUSED */
PCH_GPIO_NATIVE, /* 81: NATIVE: SPKR */ LP_GPIO_NATIVE, /* 81: NATIVE: SPKR */
PCH_GPIO_NATIVE, /* 82: NATIVE: EC_RCIN_L */ LP_GPIO_NATIVE, /* 82: NATIVE: EC_RCIN_L */
PCH_GPIO_UNUSED, /* 83: UNUSED */ LP_GPIO_UNUSED, /* 83: UNUSED */
PCH_GPIO_UNUSED, /* 84: UNUSED */ LP_GPIO_UNUSED, /* 84: UNUSED */
PCH_GPIO_UNUSED, /* 85: UNUSED */ LP_GPIO_UNUSED, /* 85: UNUSED */
PCH_GPIO_UNUSED, /* 86: UNUSED (STRAP) */ LP_GPIO_UNUSED, /* 86: UNUSED (STRAP) */
PCH_GPIO_UNUSED, /* 87: UNUSED */ LP_GPIO_UNUSED, /* 87: UNUSED */
PCH_GPIO_UNUSED, /* 88: UNUSED */ LP_GPIO_UNUSED, /* 88: UNUSED */
PCH_GPIO_UNUSED, /* 89: UNUSED */ LP_GPIO_UNUSED, /* 89: UNUSED */
PCH_GPIO_UNUSED, /* 90: UNUSED */ LP_GPIO_UNUSED, /* 90: UNUSED */
PCH_GPIO_UNUSED, /* 91: UNUSED */ LP_GPIO_UNUSED, /* 91: UNUSED */
PCH_GPIO_UNUSED, /* 92: UNUSED */ LP_GPIO_UNUSED, /* 92: UNUSED */
PCH_GPIO_UNUSED, /* 93: UNUSED */ LP_GPIO_UNUSED, /* 93: UNUSED */
PCH_GPIO_UNUSED, /* 94: UNUSED */ LP_GPIO_UNUSED, /* 94: UNUSED */
PCH_GPIO_END LP_GPIO_END
}; };

5
src/southbridge/intel/lynxpoint/lp_gpio.h
View File

@ -127,6 +127,11 @@
.owner = GPIO_OWNER_GPIO, \ .owner = GPIO_OWNER_GPIO, \
.pirq = GPIO_PIRQ_APIC_ROUTE } .pirq = GPIO_PIRQ_APIC_ROUTE }
#define LP_GPIO_PIRQ_INVERT \
{ .conf0 = GPIO_MODE_GPIO | GPIO_DIR_INPUT | GPIO_INVERT, \
.owner = GPIO_OWNER_GPIO, \
.pirq = GPIO_PIRQ_APIC_ROUTE }
#define LP_GPIO_OUT_HIGH \ #define LP_GPIO_OUT_HIGH \
{ .conf0 = GPIO_MODE_GPIO | GPIO_DIR_OUTPUT | GPO_LEVEL_HIGH, \ { .conf0 = GPIO_MODE_GPIO | GPIO_DIR_OUTPUT | GPO_LEVEL_HIGH, \
.owner = GPIO_OWNER_GPIO, \ .owner = GPIO_OWNER_GPIO, \