Move RPL models to new folder

Change-Id: If343c3d1c45ea88cef5e1b8912d929b1e8793b2c

src/mainboard/system76/adl/Kconfig

@@ -13,9 +13,8 @@ config BOARD_SYSTEM76_ADL_COMMON
 	select MAINBOARD_HAS_TPM2
 	select MEMORY_MAPPED_TPM
 	select NO_UART_ON_SUPERIO
+	select SOC_INTEL_ALDERLAKE_PCH_P
 	select SOC_INTEL_COMMON_BLOCK_HDA_VERB
-	select SOC_INTEL_COMMON_BLOCK_TCSS
-	select SOC_INTEL_COMMON_BLOCK_USB4
 	select SOC_INTEL_CRASHLOG
 	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
 	select SPD_READ_BY_WORD
@@ -25,36 +24,15 @@ config BOARD_SYSTEM76_DARP8
 	def_bool n
 	select BOARD_SYSTEM76_ADL_COMMON
 	select EC_SYSTEM76_EC_COLOR_KEYBOARD
-	select SOC_INTEL_ALDERLAKE_PCH_P
 
 config BOARD_SYSTEM76_GALP6
 	def_bool n
 	select BOARD_SYSTEM76_ADL_COMMON
-	select SOC_INTEL_ALDERLAKE_PCH_P
-
-config BOARD_SYSTEM76_GAZE18_3050
-	def_bool n
-	select BOARD_SYSTEM76_ADL_COMMON
-	select DRIVERS_GFX_NVIDIA
-	select EC_SYSTEM76_EC_COLOR_KEYBOARD
-	select EC_SYSTEM76_EC_DGPU
-	select SOC_INTEL_ALDERLAKE_PCH_P
-	select SOC_INTEL_RAPTORLAKE
-
-config BOARD_SYSTEM76_GAZE18_40X0
-	def_bool n
-	select BOARD_SYSTEM76_ADL_COMMON
-	select DRIVERS_GFX_NVIDIA
-	select EC_SYSTEM76_EC_COLOR_KEYBOARD
-	select EC_SYSTEM76_EC_DGPU
-	select SOC_INTEL_ALDERLAKE_PCH_S
-	select SOC_INTEL_RAPTORLAKE
 
 config BOARD_SYSTEM76_LEMP11
 	def_bool n
 	select BOARD_SYSTEM76_ADL_COMMON
 	select HAVE_SPD_IN_CBFS
-	select SOC_INTEL_ALDERLAKE_PCH_P
 
 config BOARD_SYSTEM76_ORYP9
 	def_bool n
@@ -63,7 +41,6 @@ config BOARD_SYSTEM76_ORYP9
 	select DRIVERS_I2C_TAS5825M
 	select EC_SYSTEM76_EC_COLOR_KEYBOARD
 	select EC_SYSTEM76_EC_DGPU
-	select SOC_INTEL_ALDERLAKE_PCH_P
 
 config BOARD_SYSTEM76_ORYP10
 	def_bool n
@@ -71,16 +48,6 @@ config BOARD_SYSTEM76_ORYP10
 	select DRIVERS_GFX_NVIDIA
 	select EC_SYSTEM76_EC_COLOR_KEYBOARD
 	select EC_SYSTEM76_EC_DGPU
-	select SOC_INTEL_ALDERLAKE_PCH_P
-
-config BOARD_SYSTEM76_ORYP11
-	def_bool n
-	select BOARD_SYSTEM76_ADL_COMMON
-	select DRIVERS_GFX_NVIDIA
-	select EC_SYSTEM76_EC_COLOR_KEYBOARD
-	select EC_SYSTEM76_EC_DGPU
-	select SOC_INTEL_ALDERLAKE_PCH_S
-	select SOC_INTEL_RAPTORLAKE
 
 if BOARD_SYSTEM76_ADL_COMMON
 
@@ -90,12 +57,9 @@ config MAINBOARD_DIR
 config VARIANT_DIR
 	default "darp8" if BOARD_SYSTEM76_DARP8
 	default "galp6" if BOARD_SYSTEM76_GALP6
-	default "gaze18-3050" if BOARD_SYSTEM76_GAZE18_3050
-	default "gaze18-40x0" if BOARD_SYSTEM76_GAZE18_40X0
 	default "lemp11" if BOARD_SYSTEM76_LEMP11
 	default "oryp9" if BOARD_SYSTEM76_ORYP9
 	default "oryp10" if BOARD_SYSTEM76_ORYP10
-	default "oryp11" if BOARD_SYSTEM76_ORYP11
 
 config OVERRIDE_DEVICETREE
 	default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
@@ -103,33 +67,25 @@ config OVERRIDE_DEVICETREE
 config MAINBOARD_PART_NUMBER
 	default "darp8" if BOARD_SYSTEM76_DARP8
 	default "galp6" if BOARD_SYSTEM76_GALP6
-	default "gaze18-3050" if BOARD_SYSTEM76_GAZE18_3050
-	default "gaze18-40x0" if BOARD_SYSTEM76_GAZE18_40X0
 	default "lemp11" if BOARD_SYSTEM76_LEMP11
 	default "oryp9" if BOARD_SYSTEM76_ORYP9
 	default "oryp10" if BOARD_SYSTEM76_ORYP10
-	default "oryp11" if BOARD_SYSTEM76_ORYP11
 
 config MAINBOARD_SMBIOS_PRODUCT_NAME
 	default "Darter Pro" if BOARD_SYSTEM76_DARP8
 	default "Galago Pro" if BOARD_SYSTEM76_GALP6
-	default "Gazelle" if BOARD_SYSTEM76_GAZE18_3050
-	default "Gazelle" if BOARD_SYSTEM76_GAZE18_40X0
 	default "Lemur Pro" if BOARD_SYSTEM76_LEMP11
-	default "Oryx Pro" if BOARD_SYSTEM76_ORYP9 || BOARD_SYSTEM76_ORYP10 || BOARD_SYSTEM76_ORYP11
+	default "Oryx Pro" if BOARD_SYSTEM76_ORYP9 || BOARD_SYSTEM76_ORYP10
 
 config MAINBOARD_VERSION
 	default "darp8" if BOARD_SYSTEM76_DARP8
 	default "galp6" if BOARD_SYSTEM76_GALP6
-	default "gaze18-3050" if BOARD_SYSTEM76_GAZE18_3050
-	default "gaze18-40x0" if BOARD_SYSTEM76_GAZE18_40X0
 	default "lemp11" if BOARD_SYSTEM76_LEMP11
 	default "oryp9" if BOARD_SYSTEM76_ORYP9
 	default "oryp10" if BOARD_SYSTEM76_ORYP10
-	default "oryp11" if BOARD_SYSTEM76_ORYP11
 
 config CBFS_SIZE
-	default 0x1000000
+	default 0xA00000
 
 config CONSOLE_POST
 	default y

src/mainboard/system76/adl/Kconfig.name

@@ -4,12 +4,6 @@ config BOARD_SYSTEM76_DARP8
 config BOARD_SYSTEM76_GALP6
 	bool "galp6"
 
-config BOARD_SYSTEM76_GAZE18_3050
-	bool "gaze18-3050"
-
-config BOARD_SYSTEM76_GAZE18_40X0
-	bool "gaze18-40x0"
-
 config BOARD_SYSTEM76_LEMP11
 	bool "lemp11"
 
@@ -18,6 +12,3 @@ config BOARD_SYSTEM76_ORYP9
 
 config BOARD_SYSTEM76_ORYP10
 	bool "oryp10"
-
-config BOARD_SYSTEM76_ORYP11
-	bool "oryp11"

src/mainboard/system76/rpl/Kconfig

@@ -0,0 +1,101 @@
+config BOARD_SYSTEM76_RPL_COMMON
+	def_bool n
+	select BOARD_ROMSIZE_KB_32768
+	select DRIVERS_I2C_HID
+	select DRIVERS_INTEL_PMC
+	select DRIVERS_INTEL_USB4_RETIMER
+	select EC_SYSTEM76_EC
+	select HAVE_ACPI_TABLES
+	select HAVE_CMOS_DEFAULT
+	select HAVE_OPTION_TABLE
+	select INTEL_GMA_HAVE_VBT
+	select INTEL_LPSS_UART_FOR_CONSOLE
+	select MAINBOARD_HAS_TPM2
+	select MEMORY_MAPPED_TPM
+	select NO_UART_ON_SUPERIO
+	select SOC_INTEL_COMMON_BLOCK_HDA_VERB
+	select SOC_INTEL_COMMON_BLOCK_TCSS
+	select SOC_INTEL_COMMON_BLOCK_USB4
+	select SOC_INTEL_CRASHLOG
+	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
+	select SOC_INTEL_RAPTORLAKE
+	select SPD_READ_BY_WORD
+	select SYSTEM_TYPE_LAPTOP
+
+config BOARD_SYSTEM76_GAZE18_3050
+	def_bool n
+	select BOARD_SYSTEM76_RPL_COMMON
+	select DRIVERS_GFX_NVIDIA
+	select EC_SYSTEM76_EC_COLOR_KEYBOARD
+	select EC_SYSTEM76_EC_DGPU
+	select SOC_INTEL_ALDERLAKE_PCH_P
+
+config BOARD_SYSTEM76_GAZE18_40X0
+	def_bool n
+	select BOARD_SYSTEM76_RPL_COMMON
+	select DRIVERS_GFX_NVIDIA
+	select EC_SYSTEM76_EC_COLOR_KEYBOARD
+	select EC_SYSTEM76_EC_DGPU
+	select SOC_INTEL_ALDERLAKE_PCH_S
+
+config BOARD_SYSTEM76_ORYP11
+	def_bool n
+	select BOARD_SYSTEM76_RPL_COMMON
+	select DRIVERS_GFX_NVIDIA
+	select EC_SYSTEM76_EC_COLOR_KEYBOARD
+	select EC_SYSTEM76_EC_DGPU
+	select SOC_INTEL_ALDERLAKE_PCH_S
+
+if BOARD_SYSTEM76_RPL_COMMON
+
+config MAINBOARD_DIR
+	default "system76/rpl"
+
+config VARIANT_DIR
+	default "gaze18-3050" if BOARD_SYSTEM76_GAZE18_3050
+	default "gaze18-40x0" if BOARD_SYSTEM76_GAZE18_40X0
+	default "oryp11" if BOARD_SYSTEM76_ORYP11
+
+config OVERRIDE_DEVICETREE
+	default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
+
+config MAINBOARD_PART_NUMBER
+	default "gaze18-3050" if BOARD_SYSTEM76_GAZE18_3050
+	default "gaze18-40x0" if BOARD_SYSTEM76_GAZE18_40X0
+	default "oryp11" if BOARD_SYSTEM76_ORYP11
+
+config MAINBOARD_SMBIOS_PRODUCT_NAME
+	default "Gazelle" if BOARD_SYSTEM76_GAZE18_3050 || BOARD_SYSTEM76_GAZE18_40X0
+	default "Oryx Pro" if BOARD_SYSTEM76_ORYP11
+
+config MAINBOARD_VERSION
+	default "gaze18-3050" if BOARD_SYSTEM76_GAZE18_3050
+	default "gaze18-40x0" if BOARD_SYSTEM76_GAZE18_40X0
+	default "oryp11" if BOARD_SYSTEM76_ORYP11
+
+config CBFS_SIZE
+	default 0x1000000
+
+config CONSOLE_POST
+	default y
+
+config DIMM_SPD_SIZE
+	default 512
+
+config ONBOARD_VGA_IS_PRIMARY
+	default y
+
+config POST_DEVICE
+	default n
+
+config TPM_MEASURED_BOOT
+	default y
+
+config UART_FOR_CONSOLE
+	default 0
+
+# PM Timer Disabled, saves power
+config USE_PM_ACPI_TIMER
+	default n
+
+endif

src/mainboard/system76/rpl/Kconfig.name

@@ -0,0 +1,8 @@
+config BOARD_SYSTEM76_GAZE18_3050
+	bool "gaze18-3050"
+
+config BOARD_SYSTEM76_GAZE18_40X0
+	bool "gaze18-40x0"
+
+config BOARD_SYSTEM76_ORYP11
+	bool "oryp11"

src/mainboard/system76/rpl/Makefile.inc

@@ -0,0 +1,12 @@
+CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/include
+CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include
+
+bootblock-y += bootblock.c
+bootblock-y += variants/$(VARIANT_DIR)/gpio_early.c
+
+romstage-y += variants/$(VARIANT_DIR)/romstage.c
+
+ramstage-y += ramstage.c
+ramstage-y += variants/$(VARIANT_DIR)/hda_verb.c
+ramstage-y += variants/$(VARIANT_DIR)/gpio.c
+ramstage-$(CONFIG_DRIVERS_I2C_TAS5825M) += variants/$(VARIANT_DIR)/tas5825m.c

src/mainboard/system76/rpl/acpi/backlight.asl

@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <drivers/intel/gma/acpi/gma.asl>
+
+Scope (GFX0)
+{
+	Name (BRIG, Package (22) {
+		40, /* default AC */
+		40, /* default Battery */
+		5,
+		10,
+		15,
+		20,
+		25,
+		30,
+		35,
+		40,
+		45,
+		50,
+		55,
+		60,
+		65,
+		70,
+		75,
+		80,
+		85,
+		90,
+		95,
+		100
+	})
+}

src/mainboard/system76/rpl/acpi/mainboard.asl

@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#if CONFIG(DRIVERS_GFX_NVIDIA)
+#include <variant/gpio.h>
+#endif
+
+#define EC_GPE_SCI 0x6E
+#define EC_GPE_SWI 0x6B
+#include <ec/system76/ec/acpi/ec.asl>
+
+Scope (\_SB) {
+	#include "sleep.asl"
+	Scope (PCI0) {
+		#include "backlight.asl"
+
+#if CONFIG(DRIVERS_GFX_NVIDIA)
+		Scope (PEG2) {
+			#include <drivers/gfx/nvidia/acpi/tigerlake.asl>
+		}
+#endif
+	}
+}

src/mainboard/system76/rpl/acpi/sleep.asl

@@ -0,0 +1,46 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <intelblocks/gpio.h>
+
+Method (PGPM, 1, Serialized)
+{
+	For (Local0 = 0, Local0 < 6, Local0++)
+	{
+		\_SB.PCI0.CGPM (Local0, Arg0)
+	}
+}
+
+/*
+ * Method called from _PTS prior to system sleep state entry
+ * Enables dynamic clock gating for all 5 GPIO communities
+ */
+Method (MPTS, 1, Serialized)
+{
+	\_SB.PCI0.LPCB.EC0.PTS (Arg0)
+	PGPM (MISCCFG_GPIO_PM_CONFIG_BITS)
+}
+
+/*
+ * Method called from _WAK prior to system sleep state wakeup
+ * Disables dynamic clock gating for all 5 GPIO communities
+ */
+Method (MWAK, 1, Serialized)
+{
+	PGPM (0)
+	\_SB.PCI0.LPCB.EC0.WAK (Arg0)
+}
+
+/*
+ * S0ix Entry/Exit Notifications
+ * Called from \_SB.PEPD._DSM
+ */
+Method (MS0X, 1, Serialized)
+{
+	If (Arg0 == 1) {
+		/* S0ix Entry */
+		PGPM (MISCCFG_GPIO_PM_CONFIG_BITS)
+	} Else {
+		/* S0ix Exit */
+		PGPM (0)
+	}
+}

src/mainboard/system76/rpl/board_info.txt

@@ -0,0 +1,6 @@
+Vendor name: System76
+Category: laptop
+ROM package: WSON-8
+ROM protocol: SPI
+ROM socketed: n
+Flashrom support: y

src/mainboard/system76/rpl/bootblock.c

@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <bootblock_common.h>
+#include <mainboard/gpio.h>
+
+void bootblock_mainboard_early_init(void)
+{
+	mainboard_configure_early_gpios();
+}

src/mainboard/system76/rpl/cmos.default

@@ -0,0 +1,3 @@
+boot_option=Fallback
+debug_level=Debug
+me_state=Enable

src/mainboard/system76/rpl/cmos.layout

@@ -0,0 +1,39 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+entries
+
+0	384	r	0	reserved_memory
+
+# RTC_BOOT_BYTE (coreboot hardcoded)
+384	1	e	4	boot_option
+388	4	h	0	reboot_counter
+
+# RTC_CLK_ALTCENTURY
+400	8	r	0	century
+
+412	4	e	6	debug_level
+416	1	e	2	me_state
+417	3	h	0	me_state_counter
+984	16	h	0	check_sum
+
+enumerations
+
+2	0	Enable
+2	1	Disable
+
+4	0	Fallback
+4	1	Normal
+
+6	0	Emergency
+6	1	Alert
+6	2	Critical
+6	3	Error
+6	4	Warning
+6	5	Notice
+6	6	Info
+6	7	Debug
+6	8	Spew
+
+checksums
+
+checksum 408 983 984

src/mainboard/system76/rpl/devicetree.cb

@@ -0,0 +1,96 @@
+chip soc/intel/alderlake
+	register "common_soc_config" = "{
+		// Touchpad I2C bus
+		.i2c[0] = {
+			.speed = I2C_SPEED_FAST,
+			.rise_time_ns = 80,
+			.fall_time_ns = 110,
+		},
+	}"
+
+	# Enable Enhanced Intel SpeedStep
+	register "eist_enable" = "1"
+
+	register "s0ix_enable" = "1"
+
+	# Enable C6 DRAM
+	register "enable_c6dram" = "1"
+
+	# Thermal
+	register "tcc_offset" = "8"
+
+	device cpu_cluster 0 on
+		device lapic 0 on end
+	end
+
+	device domain 0 on
+		device ref system_agent on end
+		device ref igpu on
+			# DDIA is eDP, DDIB is HDMI
+			register "ddi_portA_config" = "1"
+			register "ddi_ports_config" = "{
+				[DDI_PORT_A] = DDI_ENABLE_HPD,
+				[DDI_PORT_B] = DDI_ENABLE_HPD | DDI_ENABLE_DDC,
+			}"
+
+			register "gfx" = "GMA_DEFAULT_PANEL(0)"
+		end
+		#TODO device ref tbt_pcie_rp0 on end
+		device ref shared_sram on end
+		device ref cnvi_wifi on
+			register "cnvi_bt_core" = "true"
+			register "cnvi_bt_audio_offload" = "true"
+			chip drivers/wifi/generic
+				register "wake" = "GPE0_PME_B0"
+				device generic 0 on end
+			end
+		end
+		device ref i2c0 on
+			# Touchpad I2C bus
+			register "serial_io_i2c_mode[PchSerialIoIndexI2C0]" = "PchSerialIoPci"
+			chip drivers/i2c/hid
+				register "generic.hid" = ""ELAN0412""
+				register "generic.desc" = ""ELAN Touchpad""
+				register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPP_E12)"
+				register "generic.detect" = "1"
+				register "hid_desc_reg_offset" = "0x01"
+				device i2c 15 on end
+			end
+			chip drivers/i2c/hid
+				register "generic.hid" = ""FTCS1000""
+				register "generic.desc" = ""FocalTech Touchpad""
+				register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPP_E12)"
+				register "generic.detect" = "1"
+				register "hid_desc_reg_offset" = "0x01"
+				device i2c 38 on end
+			end
+		end
+		device ref i2c1 on
+			register "serial_io_i2c_mode[PchSerialIoIndexI2C1]" = "PchSerialIoPci"
+		end
+
+		device ref heci1 on end
+		device ref sata on
+			register "sata_salp_support" = "1"
+			register "sata_ports_enable[1]" = "1" # SSD1
+			# FIXME: DevSlp breaks S0ix
+			#register "sata_ports_dev_slp[1]" = "1" # GPP_H12 (SATA1_DEVSLP1)
+		end
+		device ref pch_espi on
+			register "gen1_dec" = "0x00040069" # EC PM channel
+			register "gen2_dec" = "0x00fc0e01" # AP/EC command
+			register "gen3_dec" = "0x00fc0f01" # AP/EC debug
+			chip drivers/pc80/tpm
+				device pnp 0c31.0 on end
+			end
+		end
+		device ref p2sb on end
+		device ref hda on
+			register "pch_hda_idisp_codec_enable" = "1"
+			register "pch_hda_idisp_link_frequency" = "HDA_LINKFREQ_96MHZ"
+			register "pch_hda_idisp_link_tmode" = "HDA_TMODE_8T"
+		end
+		device ref smbus on end
+		device ref fast_spi on end
+	end
+end

src/mainboard/system76/rpl/dsdt.asl

@@ -0,0 +1,33 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <acpi/acpi.h>
+DefinitionBlock(
+	"dsdt.aml",
+	"DSDT",
+	ACPI_DSDT_REV_2,
+	OEM_ID,
+	ACPI_TABLE_CREATOR,
+	0x20110725
+)
+{
+	#include <acpi/dsdt_top.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
+	#include <cpu/intel/common/acpi/cpu.asl>
+
+	Device (\_SB.PCI0)
+	{
+		#include <soc/intel/common/block/acpi/acpi/northbridge.asl>
+		#include <soc/intel/alderlake/acpi/southbridge.asl>
+		#include <soc/intel/alderlake/acpi/tcss.asl>
+	}
+
+	#include <southbridge/intel/common/acpi/sleepstates.asl>
+
+	Scope (\_SB.PCI0.LPCB)
+	{
+		#include <drivers/pc80/pc/ps2_controller.asl>
+	}
+
+	#include "acpi/mainboard.asl"
+}

src/mainboard/system76/rpl/include/mainboard/gpio.h

@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef MAINBOARD_GPIO_H
+#define MAINBOARD_GPIO_H
+
+void mainboard_configure_early_gpios(void);
+void mainboard_configure_gpios(void);
+
+#endif

src/mainboard/system76/rpl/ramstage.c

@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <mainboard/gpio.h>
+#include <soc/ramstage.h>
+#include <smbios.h>
+
+smbios_wakeup_type smbios_system_wakeup_type(void)
+{
+	return SMBIOS_WAKEUP_TYPE_POWER_SWITCH;
+}
+
+void mainboard_silicon_init_params(FSP_S_CONFIG *params)
+{
+	// TODO: Pin Mux settings
+}
+
+static void mainboard_init(void *chip_info)
+{
+	mainboard_configure_gpios();
+}
+
+struct chip_operations mainboard_ops = {
+	.init = mainboard_init,
+};