mb/system76/oryp6: Add Oryx Pro 7 as a variant

Change-Id: Id00a45a6a6acf0880934c55f1a3f18e63f2aed43
Signed-off-by: Jeremy Soller <jeremy@system76.com>
Signed-off-by: Tim Crawford <tcrawford@system76.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/52296
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>

13 files changed, 365 insertions, 3 deletions

diff --git a/src/mainboard/system76/oryp6/Kconfig b/src/mainboard/system76/oryp6/Kconfig
index 5a6100c4a2..b4a5903a3a 100644
--- a/src/mainboard/system76/oryp6/Kconfig
+++ b/src/mainboard/system76/oryp6/Kconfig
@@ -1,4 +1,4 @@
-if BOARD_SYSTEM76_ORYP6
+if BOARD_SYSTEM76_ORYP6 || BOARD_SYSTEM76_ORYP7
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
@@ -23,24 +23,28 @@ config BOARD_SPECIFIC_OPTIONS
 	select SOC_INTEL_COMMON_BLOCK_HDA_VERB
 	select SPD_READ_BY_WORD
 	select SYSTEM_TYPE_LAPTOP
+	select TPM_RDRESP_NEED_DELAY
 
 config MAINBOARD_DIR
 	default "system76/oryp6"
 
 config VARIANT_DIR
 	default "oryp6" if BOARD_SYSTEM76_ORYP6
+	default "oryp7" if BOARD_SYSTEM76_ORYP7
 
 config OVERRIDE_DEVICETREE
 	default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
 
 config MAINBOARD_PART_NUMBER
 	default "oryp6" if BOARD_SYSTEM76_ORYP6
+	default "oryp7" if BOARD_SYSTEM76_ORYP7
 
 config MAINBOARD_SMBIOS_PRODUCT_NAME
 	default "Oryx Pro"
 
 config MAINBOARD_VERSION
 	default "oryp6" if BOARD_SYSTEM76_ORYP6
+	default "oryp7" if BOARD_SYSTEM76_ORYP7
 
 config CBFS_SIZE
 	default 0xA00000
diff --git a/src/mainboard/system76/oryp6/Kconfig.name b/src/mainboard/system76/oryp6/Kconfig.name
index 8012d03d66..605ca3e43e 100644
--- a/src/mainboard/system76/oryp6/Kconfig.name
+++ b/src/mainboard/system76/oryp6/Kconfig.name
@@ -1,2 +1,5 @@
 config BOARD_SYSTEM76_ORYP6
 	bool "oryp6"
+
+config BOARD_SYSTEM76_ORYP7
+	bool "oryp7"
diff --git a/src/mainboard/system76/oryp6/Makefile.inc b/src/mainboard/system76/oryp6/Makefile.inc
index bc055f86b2..2267eb6f9f 100644
--- a/src/mainboard/system76/oryp6/Makefile.inc
+++ b/src/mainboard/system76/oryp6/Makefile.inc
@@ -4,6 +4,7 @@ bootblock-y += bootblock.c
 bootblock-y += variants/$(VARIANT_DIR)/gpio_early.c
 
 romstage-y += romstage.c
+romstage-y += variants/$(VARIANT_DIR)/romstage.c
 
 ramstage-y += ramstage.c
 ramstage-y += tas5825m.c
diff --git a/src/mainboard/system76/oryp6/include/variant/romstage.h b/src/mainboard/system76/oryp6/include/variant/romstage.h
new file mode 100644
index 0000000000..072a485334
--- /dev/null
+++ b/src/mainboard/system76/oryp6/include/variant/romstage.h
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef VARIANT_ROMSTAGE_H
+#define VARIANT_ROMSTAGE_H
+
+#include <fsp/soc_binding.h>
+
+void variant_configure_fspm(FSPM_UPD *memupd);
+
+#endif
diff --git a/src/mainboard/system76/oryp6/romstage.c b/src/mainboard/system76/oryp6/romstage.c
index 6309e4a42a..8ea791a2d1 100644
--- a/src/mainboard/system76/oryp6/romstage.c
+++ b/src/mainboard/system76/oryp6/romstage.c
@@ -2,6 +2,7 @@
 
 #include <soc/cnl_memcfg_init.h>
 #include <soc/romstage.h>
+#include <variant/romstage.h>
 
 static const struct cnl_mb_cfg memcfg = {
 	.spd[0] = {
@@ -20,8 +21,7 @@ static const struct cnl_mb_cfg memcfg = {
 
 void mainboard_memory_init_params(FSPM_UPD *memupd)
 {
-	// Allow memory speeds higher than 2933 MT/s
-	memupd->FspmConfig.SaOcSupport = 1;
+	variant_configure_fspm(memupd);
 
 	cannonlake_memcfg_init(&memupd->FspmConfig, &memcfg);
 }
diff --git a/src/mainboard/system76/oryp6/variants/oryp6/romstage.c b/src/mainboard/system76/oryp6/variants/oryp6/romstage.c
new file mode 100644
index 0000000000..aa92a5e565
--- /dev/null
+++ b/src/mainboard/system76/oryp6/variants/oryp6/romstage.c
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <variant/romstage.h>
+
+void variant_configure_fspm(FSPM_UPD *memupd)
+{
+	// Allow memory speeds higher than 2933 MT/s
+	memupd->FspmConfig.SaOcSupport = 1;
+}
diff --git a/src/mainboard/system76/oryp6/variants/oryp7/board_info.txt b/src/mainboard/system76/oryp6/variants/oryp7/board_info.txt
new file mode 100644
index 0000000000..4780b9bbee
--- /dev/null
+++ b/src/mainboard/system76/oryp6/variants/oryp7/board_info.txt
@@ -0,0 +1,2 @@
+Board name: oryp7
+Release year: 2021
diff --git a/src/mainboard/system76/oryp6/variants/oryp7/data.vbt b/src/mainboard/system76/oryp6/variants/oryp7/data.vbt
new file mode 100644
index 0000000000..ee4cecd80e
--- /dev/null
+++ b/src/mainboard/system76/oryp6/variants/oryp7/data.vbt
diff --git a/src/mainboard/system76/oryp6/variants/oryp7/gpio.c b/src/mainboard/system76/oryp6/variants/oryp7/gpio.c
new file mode 100644
index 0000000000..88fb95a06f
--- /dev/null
+++ b/src/mainboard/system76/oryp6/variants/oryp7/gpio.c
@@ -0,0 +1,266 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <soc/gpio.h>
+#include <variant/gpio.h>
+
+static const struct pad_config gpio_table[] = {
+	/* ------- GPIO Group GPD ------- */
+	PAD_CFG_NF(GPD0, NONE, DEEP, NF1), // PM_BATLOW#
+	PAD_CFG_NF(GPD1, NATIVE, DEEP, NF1), // AC_PRESENT
+	PAD_CFG_GPI(GPD2, NATIVE, PWROK), // LAN_WAKEUP#
+	PAD_CFG_NF(GPD3, UP_20K, DEEP, NF1), // PWR_BTN#
+	PAD_CFG_NF(GPD4, NONE, DEEP, NF1), // SUSB#_PCH
+	PAD_CFG_NF(GPD5, NONE, DEEP, NF1), // SUSC#_PCH
+	PAD_NC(GPD6, NONE),
+	PAD_CFG_GPI(GPD7, UP_20K, PWROK), /* GPD_7: crystal input
+					     low = single ended,
+					     high = differential
+					   */
+	PAD_CFG_NF(GPD8, NONE, DEEP, NF1), // SUS_CLK
+	PAD_NC(GPD9, NONE),
+	PAD_CFG_NF(GPD10, NONE, DEEP, NF1), // SLP_S5#
+	PAD_NC(GPD11, NONE),
+
+	/* ------- GPIO Group GPP_A ------- */
+	PAD_CFG_NF(GPP_A0, NONE, DEEP, NF1), // SB_KBCRST#
+	PAD_CFG_NF(GPP_A1, NONE, DEEP, NF1), // LPC_AD0
+	PAD_CFG_NF(GPP_A2, NONE, DEEP, NF1), // LPC_AD1
+	PAD_CFG_NF(GPP_A3, NONE, DEEP, NF1), // LPC_AD2
+	PAD_CFG_NF(GPP_A4, NONE, DEEP, NF1), // LPC_AD3
+	PAD_CFG_NF(GPP_A5, NONE, DEEP, NF1), // LPC_FRAME#
+	PAD_CFG_NF(GPP_A6, NONE, DEEP, NF1), // SERIRQ
+	PAD_CFG_NF(GPP_A7, NONE, DEEP, NF1), // LPC_PIRQA#
+	PAD_CFG_NF(GPP_A8, NONE, DEEP, NF1), // PM_CLKRUN#
+	PAD_CFG_NF(GPP_A9, NONE, DEEP, NF1), // PCLK_KBC
+	PAD_NC(GPP_A10, NONE),
+	PAD_CFG_GPI(GPP_A11, UP_20K, DEEP), // LAN_WAKEUP#
+	PAD_CFG_GPO(GPP_A12, 1, DEEP), // ROM_I2C_EN
+	PAD_NC(GPP_A13, NONE), // SUSWARN# (test point)
+	PAD_NC(GPP_A14, NONE),
+	PAD_NC(GPP_A15, NONE), // SUS_PWR_ACK# (test point)
+	PAD_NC(GPP_A16, NONE),
+	PAD_NC(GPP_A17, NONE),
+	PAD_NC(GPP_A18, NONE), // GPP_A18 (test point)
+	PAD_CFG_GPO(GPP_A19, 1, DEEP), // SB_BLON
+	PAD_NC(GPP_A20, NONE),
+	PAD_CFG_GPI(GPP_A21, UP_20K, DEEP), // EAPD_MODE
+	PAD_CFG_GPO(GPP_A22, 1, DEEP), // WLAN_SSD2_GPIO1
+	PAD_CFG_GPO(GPP_A23, 1, DEEP), // WLAN_SSD2_GPIO
+
+	/* ------- GPIO Group GPP_B ------- */
+	_PAD_CFG_STRUCT(GPP_B0, 0x42080100, 0x3000), // TPM_PIRQ#
+	PAD_NC(GPP_B1, NONE),
+	PAD_NC(GPP_B2, NONE),
+	PAD_CFG_GPO(GPP_B3, 1, DEEP), // BT_EN
+	PAD_CFG_GPO(GPP_B4, 1, DEEP), // WLAN_EN
+	PAD_CFG_NF(GPP_B5, NONE, DEEP, NF1), // TBT_CLKREQ#
+	PAD_CFG_GPI(GPP_B6, NONE, DEEP), // DDS_ID0
+	PAD_CFG_GPO(GPP_B7, 1, PLTRST), // CR_GPIO_RST#
+	PAD_CFG_GPO(GPP_B8, 1, PLTRST), // CR_GPIO_WAKE#
+	PAD_CFG_GPI(GPP_B9, NONE, DEEP), // DDS_DET
+	PAD_CFG_GPI(GPP_B10, NONE, DEEP), // GSYNC_DET
+	PAD_NC(GPP_B11, NONE),
+	PAD_CFG_GPI(GPP_B12, UP_20K, DEEP), // SLP_S0#
+	PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1), // PLT_RST#
+	PAD_CFG_NF(GPP_B14, NONE, DEEP, NF1), // PCH_SPKR
+	PAD_NC(GPP_B15, NONE),
+	PAD_NC(GPP_B16, NONE),
+	PAD_NC(GPP_B17, NONE),
+	PAD_NC(GPP_B18, NONE), // LPSS_GSPI0_MOSI (test point)
+	PAD_NC(GPP_B19, NONE),
+	PAD_NC(GPP_B20, NONE),
+	PAD_NC(GPP_B21, NONE),
+	PAD_CFG_GPI(GPP_B22, UP_20K, DEEP), // LPSS_GSPI1_MOSI (boot strap)
+	PAD_CFG_NF(GPP_B23, NONE, DEEP, NF2), // PCH_HOT_GNSS_DISABLE (boot strap)
+
+	/* ------- GPIO Group GPP_C ------- */
+	PAD_CFG_NF(GPP_C0, NONE, DEEP, NF1), // SMB_CLK
+	PAD_CFG_NF(GPP_C1, NONE, DEEP, NF1), // SMB_DATA
+	PAD_CFG_GPI(GPP_C2, UP_20K, DEEP), // CNVI_WAKE#
+	PAD_NC(GPP_C3, NONE),
+	PAD_NC(GPP_C4, NONE),
+	PAD_CFG_GPI(GPP_C5, UP_20K, DEEP), // WLAN_WAKEUP#
+	PAD_CFG_GPI(GPP_C6, UP_20K, DEEP), // SMC_CPU_THERM
+	PAD_CFG_GPI(GPP_C7, UP_20K, DEEP), // SMD_CPU_THERM
+	PAD_CFG_GPI(GPP_C8, NONE, PLTRST), // TPM_DET
+	PAD_CFG_GPI(GPP_C9, NONE, DEEP), // CNVI_DET#
+	PAD_NC(GPP_C10, NONE),
+	PAD_NC(GPP_C11, NONE),
+	PAD_NC(GPP_C12, NONE),
+	PAD_NC(GPP_C13, NONE),
+	//PAD_CFG_GPO(GPP_C14, 1, RSMRST), // M.2_PLT_RST_CNTRL1#
+	//PAD_CFG_GPO(GPP_C15, 1, RSMRST), // M.2_PLT_RST_CNTRL2#
+	PAD_CFG_NF(GPP_C16, NONE, PLTRST, NF1), // I2C_SDA_TP
+	PAD_CFG_NF(GPP_C17, NONE, PLTRST, NF1), // I2C_SCL_TP
+	PAD_CFG_NF(GPP_C18, NONE, PLTRST, NF1), // I2C_SDA_Pantone
+	PAD_CFG_NF(GPP_C19, NONE, PLTRST, NF1), // I2C_SCL_Pantone
+	PAD_CFG_GPI(GPP_C20, UP_20K, DEEP), // CNVI_MFUART2_RXD
+	PAD_CFG_GPI(GPP_C21, UP_20K, DEEP), // CNVI_MFUART2_TXD
+	PAD_CFG_GPI(GPP_C22, UP_20K, DEEP), // LAN_PLT_RST#
+	PAD_NC(GPP_C23, UP_20K),
+
+	/* ------- GPIO Group GPP_D ------- */
+	PAD_NC(GPP_D0, NONE),
+	PAD_NC(GPP_D1, NONE),
+	PAD_NC(GPP_D2, NONE),
+	PAD_NC(GPP_D3, NONE),
+	PAD_CFG_NF(GPP_D4, NONE, PLTRST, NF2), // I2C_SDA_PDROM
+	PAD_CFG_NF(GPP_D5, NONE, DEEP, NF3), // CNVI_RST#
+	PAD_CFG_NF(GPP_D6, NONE, DEEP, NF3),  // CNVI_CLKREQ
+	PAD_NC(GPP_D7, NONE), // M.2_BT_PCMIN (test point)
+	PAD_NC(GPP_D8, NONE), // M.2_BT_PCMCLK (test point)
+	PAD_NC(GPP_D9, NONE),
+	PAD_NC(GPP_D10, NONE),
+	PAD_NC(GPP_D11, NONE),
+	PAD_NC(GPP_D12, NONE),
+	PAD_NC(GPP_D13, NONE),
+	PAD_NC(GPP_D14, NONE),
+	PAD_NC(GPP_D15, NONE),
+	PAD_NC(GPP_D16, NONE),
+	PAD_NC(GPP_D17, NONE),
+	PAD_NC(GPP_D18, NONE),
+	PAD_NC(GPP_D19, NONE),
+	PAD_NC(GPP_D20, NONE),
+	PAD_NC(GPP_D21, NONE),
+	PAD_NC(GPP_D22, NONE),
+	PAD_CFG_NF(GPP_D23, NONE, PLTRST, NF2), // I2C_SCL_PDROM
+
+	/* ------- GPIO Group GPP_E ------- */
+	PAD_NC(GPP_E0, NONE),
+	PAD_CFG_NF(GPP_E1, NONE, DEEP, NF1), // M.2_SSD1_PEDET
+	PAD_NC(GPP_E2, NONE),
+	PAD_CFG_GPI(GPP_E3, NONE, DEEP), // 10k pull up
+	PAD_NC(GPP_E4, NONE),
+	PAD_CFG_NF(GPP_E5, NONE, DEEP, NF1), // M2_P1_SATA_DEVSLP
+	_PAD_CFG_STRUCT(GPP_E6, 0x82040100, 0x0000), // SMI#
+	PAD_CFG_GPI_APIC_LOW(GPP_E7, NONE, PLTRST), // TP_ATTN#
+	PAD_CFG_NF(GPP_E8, NONE, DEEP, NF1), // PCH_SATAHDD_LED#
+	PAD_NC(GPP_E9, NONE), // USB_OC0# (test point)
+	PAD_NC(GPP_E10, NONE), // USB_OC1# (test point)
+	PAD_NC(GPP_E11, NONE), // USB_OC2# (test point)
+	PAD_NC(GPP_E12, NONE), // USB_OC3# (test point)
+
+	/* ------- GPIO Group GPP_F ------- */
+	//PAD_CFG_GPO(GPP_F0, 1, RSMRST), // TBT_PERST_N
+	PAD_CFG_GPI(GPP_F1, NONE, DEEP), // M.2_SSD2_PEDET (board error)
+	PAD_CFG_GPI(GPP_F2, NONE, DEEP), // TBTA_HRESET
+	PAD_NC(GPP_F3, NONE),
+	PAD_NC(GPP_F4, NONE),
+	PAD_NC(GPP_F5, NONE), // PLVDD_RST_EC
+	PAD_CFG_NF(GPP_F6, NONE, DEEP, NF1), // M2_P4_SATA_DEVSLP (board error)
+	PAD_NC(GPP_F7, NONE), // BL_PWM_EN_EC
+	PAD_NC(GPP_F8, NONE), // MUX_CTRL_BIOS
+	PAD_NC(GPP_F9, NONE), // PS8461_SW
+	PAD_CFG_GPI(GPP_F10, UP_20K, DEEP), // BIOS_REC
+	PAD_CFG_GPI(GPP_F11, UP_20K, DEEP), // PCH_RSVD
+	PAD_NC(GPP_F12, NONE),
+	PAD_CFG_GPI(GPP_F13, UP_20K, DEEP), // GP39_GFX_CRB_DETECT
+	PAD_CFG_GPI(GPP_F14, UP_20K, DEEP), // 10k pull to H_SKTOCC_N
+	PAD_NC(GPP_F15, NONE), // USB_OC4# (test point)
+	PAD_NC(GPP_F16, NONE),
+	PAD_NC(GPP_F17, NONE),
+	PAD_NC(GPP_F18, NONE), // USB_OC7# (test point)
+	PAD_CFG_NF(GPP_F19, NONE, DEEP, NF1), // NB_ENAVDD
+	PAD_CFG_NF(GPP_F20, NONE, DEEP, NF1), // BLON
+	PAD_CFG_NF(GPP_F21, NONE, DEEP, NF1), // EDP_BRIGHTNESS
+	//PAD_CFG_GPO(GPP_F22, 0, DEEP), // DGPU_RST#_PCH
+	//PAD_CFG_GPO(GPP_F23, 0, DEEP), // DGPU_PWR_EN
+
+	/* ------- GPIO Group GPP_G ------- */
+	PAD_CFG_GPI(GPP_G0, DN_20K, DEEP), // BOARD_ID1
+	PAD_CFG_GPI(GPP_G1, DN_20K, DEEP), // BOARD_ID2
+	PAD_CFG_GPI(GPP_G2, DN_20K, DEEP), // BOARD_ID3
+	PAD_CFG_GPI(GPP_G3, DN_20K, DEEP), // BOARD_ID4
+	PAD_CFG_GPI(GPP_G4, UP_20K, DEEP), // GPIO4_NVVDD_EN_R
+	PAD_NC(GPP_G5, NONE),
+	PAD_NC(GPP_G6, NONE),
+	PAD_NC(GPP_G7, NONE),
+
+	/* ------- GPIO Group GPP_H ------- */
+	PAD_CFG_NF(GPP_H0, NONE, DEEP, NF1), // WLAN_CLKREQ#
+	PAD_CFG_NF(GPP_H1, NONE, DEEP, NF1), // CLK_REQ7_LAN#
+	PAD_CFG_NF(GPP_H2, NONE, DEEP, NF1), // CLK_REQ8_PEG#
+	PAD_CFG_NF(GPP_H3, NONE, DEEP, NF1), // CLK_REQ9_CARD#
+	_PAD_CFG_STRUCT(GPP_H4, 0x40880100, 0x3000), // RTD3_PCIE_WAKE#
+	PAD_CFG_NF(GPP_H5, NONE, DEEP, NF1), // CLK_REQ11_SSD2#
+	PAD_CFG_NF(GPP_H6, NONE, DEEP, NF1), // CLK_REQ12_SSD1#
+	PAD_NC(GPP_H7, NONE),
+	PAD_NC(GPP_H8, NONE),
+	PAD_NC(GPP_H9, NONE),
+	PAD_NC(GPP_H10, NONE),
+	PAD_NC(GPP_H11, NONE),
+	PAD_NC(GPP_H12, NONE), // eSPI flash sharing mode strap
+	PAD_CFG_GPI(GPP_H13, NONE, DEEP), // 100k pull up
+	PAD_NC(GPP_H14, NONE),
+	PAD_CFG_GPI(GPP_H15, NONE, DEEP), // 100k pull up
+	//PAD_CFG_GPO(GPP_H16, 1, RSMRST), // TBT_RTD3_PWR_EN_R
+	PAD_CFG_GPO(GPP_H17, 1, PLTRST), // TBT_FORCE_PWR_R
+	PAD_NC(GPP_H18, NONE),
+	PAD_CFG_GPO(GPP_H19, 1, DEEP), // GPIO_CARD_AUX
+	PAD_CFG_GPO(GPP_H20, 1, DEEP), // GPIO_CARD
+	PAD_CFG_GPI(GPP_H21, UP_20K, DEEP), // 20k pull down, 4.7k pull up
+	PAD_NC(GPP_H22, NONE),
+	PAD_CFG_GPI(GPP_H23, NONE, DEEP), // DGPU_SELECT#
+
+	/* ------- GPIO Group GPP_I ------- */
+	PAD_NC(GPP_I0, NONE),
+	_PAD_CFG_STRUCT(GPP_I1, 0x46880100, 0x0000), // HDMI_HPD
+	_PAD_CFG_STRUCT(GPP_I2, 0x46880100, 0x0000), // G_DP_DHPD_E
+	_PAD_CFG_STRUCT(GPP_I3, 0x46880100, 0x0000), // OUT2_HPD
+	PAD_CFG_NF(GPP_I4, NONE, DEEP, NF1), // SB_IEDP_HPD
+	PAD_NC(GPP_I5, NONE),
+	PAD_NC(GPP_I6, NONE),
+	PAD_NC(GPP_I7, NONE),
+	PAD_NC(GPP_I8, NONE),
+	PAD_NC(GPP_I9, NONE),
+	_PAD_CFG_STRUCT(GPP_I10, 0x82880100, 0x0000), // TBCIO_PLUG_EVENT
+	PAD_CFG_GPI(GPP_I11, UP_20K, DEEP), // 10k pull to H_SKTOCC_N, 10k pull up
+	PAD_CFG_GPI(GPP_I12, DN_20K, DEEP), // D02C_BOARD_ID (10k pull up)
+	PAD_NC(GPP_I13, NONE),
+	PAD_NC(GPP_I14, NONE),
+
+	/* ------- GPIO Group GPP_J ------- */
+	PAD_CFG_NF(GPP_J0, NONE, DEEP, NF1), // CNVI_GNSS_PA_BLANKING
+	PAD_CFG_NF(GPP_J1, NONE, DEEP, NF1), // CPU_VCCIO_PWR_GATE
+	PAD_CFG_GPI(GPP_J2, UP_20K, DEEP), // 100k pull down
+	PAD_NC(GPP_J3, NONE),
+	PAD_CFG_NF(GPP_J4, NONE, DEEP, NF1), // M.2_CNV_BRI_DT_BT_UART0_RTS
+	PAD_CFG_NF(GPP_J5, UP_20K, DEEP, NF1), // M.2_CNV_BRI_RSP
+	PAD_CFG_NF(GPP_J6, NONE, DEEP, NF1), // M.2_CNV_RGI_DT_BT_UART0_TX
+	PAD_CFG_NF(GPP_J7, UP_20K, DEEP, NF1), // M.2_CNV_RGI_RSP
+	PAD_NC(GPP_J8, NONE),
+	PAD_CFG_GPI(GPP_J9, UP_20K, DEEP), // 100k pull up, 100k pull down
+	PAD_CFG_GPI(GPP_J10, UP_20K, DEEP), // 100k pull down
+	PAD_CFG_GPI(GPP_J11, UP_20K, DEEP), // 75k pull down
+
+	/* ------- GPIO Group GPP_K ------- */
+	PAD_NC(GPP_K0, NONE),
+	PAD_NC(GPP_K1, NONE),
+	PAD_NC(GPP_K2, NONE),
+	_PAD_CFG_STRUCT(GPP_K3, 0x80880100, 0x3000), // SCI#
+	PAD_NC(GPP_K4, NONE),
+	PAD_NC(GPP_K5, NONE),
+	_PAD_CFG_STRUCT(GPP_K6, 0x40880100, 0x0000), // SWI#
+	PAD_NC(GPP_K7, NONE),
+	//PAD_CFG_GPO(GPP_K8, 1, RSMRST), // SATA_M2_PWR_EN1
+	//PAD_CFG_GPO(GPP_K9, 1, RSMRST), // SATA_M2_PWR_EN2
+	PAD_CFG_GPO(GPP_K10, 1, DEEP), // LANRTD3_WAKE#
+	//PAD_CFG_GPO(GPP_K11, 1, RSMRST), // GPIO_LANRTD3
+	PAD_NC(GPP_K12, NONE),
+	PAD_NC(GPP_K13, NONE),
+	PAD_CFG_GPI(GPP_K14, UP_20K, DEEP), // GPP_K_14_GSXDIN (test point)
+	PAD_NC(GPP_K15, NONE),
+	PAD_NC(GPP_K16, NONE),
+	PAD_NC(GPP_K17, NONE),
+	PAD_NC(GPP_K18, NONE),
+	PAD_CFG_GPI(GPP_K19, UP_20K, DEEP), // SMI#
+	PAD_NC(GPP_K20, NONE),
+	PAD_CFG_GPI(GPP_K21, NONE, DEEP), // GC6_FB_EN_PCH
+	PAD_CFG_GPO(GPP_K22, 0, DEEP), // OVRM
+	PAD_CFG_GPI(GPP_K23, NONE, DEEP), // DGPU_PWRGD_R
+};
+
+void variant_configure_gpios(void)
+{
+	gpio_configure_pads(gpio_table, ARRAY_SIZE(gpio_table));
+}
diff --git a/src/mainboard/system76/oryp6/variants/oryp7/gpio_early.c b/src/mainboard/system76/oryp6/variants/oryp7/gpio_early.c
new file mode 100644
index 0000000000..cc60c322b2
--- /dev/null
+++ b/src/mainboard/system76/oryp6/variants/oryp7/gpio_early.c
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <soc/gpio.h>
+#include <variant/gpio.h>
+
+static const struct pad_config early_gpio_table[] = {
+	PAD_CFG_GPO(GPP_C14, 1, RSMRST), // M.2_PLT_RST_CNTRL1#
+	PAD_CFG_GPO(GPP_C15, 1, RSMRST), // M.2_PLT_RST_CNTRL2#
+	PAD_CFG_GPO(GPP_F0, 1, RSMRST), // TBT_PERST_N
+	PAD_CFG_GPO(GPP_F22, 0, DEEP), // DGPU_RST#_PCH
+	PAD_CFG_GPO(GPP_F23, 0, DEEP), // DGPU_PWR_EN
+	PAD_CFG_GPO(GPP_H16, 1, RSMRST), // TBT_RTD3_PWR_EN_R
+	PAD_CFG_GPO(GPP_K8, 1, RSMRST), // SATA_M2_PWR_EN1
+	PAD_CFG_GPO(GPP_K9, 1, RSMRST), // SATA_M2_PWR_EN2
+	PAD_CFG_GPO(GPP_K11, 1, RSMRST), // GPIO_LANRTD3
+};
+
+void variant_configure_early_gpios(void)
+{
+	gpio_configure_pads(early_gpio_table, ARRAY_SIZE(early_gpio_table));
+}
diff --git a/src/mainboard/system76/oryp6/variants/oryp7/hda_verb.c b/src/mainboard/system76/oryp6/variants/oryp7/hda_verb.c
new file mode 100644
index 0000000000..cc959b8aaf
--- /dev/null
+++ b/src/mainboard/system76/oryp6/variants/oryp7/hda_verb.c
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <device/azalia_device.h>
+
+const u32 cim_verb_data[] = {
+	/* Realtek, ALC1220 */
+	0x10ec1220, /* Vendor ID */
+	0x155865e5, /* Subsystem ID */
+	12, /* Number of entries */
+	AZALIA_SUBVENDOR(0, 0x155865e5),
+	AZALIA_PIN_CFG(0, 0x12, 0x90a60130),
+	AZALIA_PIN_CFG(0, 0x14, 0x0421101f),
+	AZALIA_PIN_CFG(0, 0x15, 0x40000000),
+	AZALIA_PIN_CFG(0, 0x16, 0x411111f0),
+	AZALIA_PIN_CFG(0, 0x17, 0x411111f0),
+	AZALIA_PIN_CFG(0, 0x18, 0x04a11040),
+	AZALIA_PIN_CFG(0, 0x19, 0x411111f0),
+	AZALIA_PIN_CFG(0, 0x1a, 0x411111f0),
+	AZALIA_PIN_CFG(0, 0x1b, 0x90170110),
+	AZALIA_PIN_CFG(0, 0x1d, 0x40b7952d),
+	AZALIA_PIN_CFG(0, 0x1e, 0x04451150),
+};
+
+const u32 pc_beep_verbs[] = {
+	// Enable DMIC microphone on ALC1220
+	0x02050036,
+	0x02042a6a,
+};
+
+AZALIA_ARRAY_SIZES;
diff --git a/src/mainboard/system76/oryp6/variants/oryp7/overridetree.cb b/src/mainboard/system76/oryp6/variants/oryp7/overridetree.cb
new file mode 100644
index 0000000000..3be1b157f1
--- /dev/null
+++ b/src/mainboard/system76/oryp6/variants/oryp7/overridetree.cb
@@ -0,0 +1,5 @@
+chip soc/intel/cannonlake
+	device domain 0 on
+		subsystemid 0x1558 0x65e5 inherit
+	end
+end
diff --git a/src/mainboard/system76/oryp6/variants/oryp7/romstage.c b/src/mainboard/system76/oryp6/variants/oryp7/romstage.c
new file mode 100644
index 0000000000..2873dd6914
--- /dev/null
+++ b/src/mainboard/system76/oryp6/variants/oryp7/romstage.c
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <variant/romstage.h>
+
+void variant_configure_fspm(FSPM_UPD *memupd)
+{
+	// Typically, we set SaOcSupport to allow overclocking RAM,
+	// but oryp7 saw a high fail rate when using 3200 MHz DIMMs.
+	// So disable OC so modules run at the standard 2933 MHz.
+	memupd->FspmConfig.SaOcSupport = 0;
+}