Aaron Durbin submitted this change.
mb/google/dedede: add lalala variant
The Lalala variant is a design that differs only
in replacing Cr50 with a discrete TPM part.
BUG=b:184151664
Change-Id: I2f7abb9637cd5a13ac896396781b19feb156c948
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/52031
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
Reviewed-by: Aseda Aboagye <aaboagye@google.com>
---
M src/mainboard/google/dedede/Kconfig
M src/mainboard/google/dedede/Kconfig.name
A src/mainboard/google/dedede/variants/lalala/Makefile.inc
A src/mainboard/google/dedede/variants/lalala/include/variant/ec.h
A src/mainboard/google/dedede/variants/lalala/include/variant/gpio.h
A src/mainboard/google/dedede/variants/lalala/memory/Makefile.inc
A src/mainboard/google/dedede/variants/lalala/memory/dram_id.generated.txt
A src/mainboard/google/dedede/variants/lalala/memory/mem_list_variant.txt
A src/mainboard/google/dedede/variants/lalala/overridetree.cb
A src/mainboard/google/dedede/variants/lalala/variant.c
10 files changed, 369 insertions(+), 0 deletions(-)
diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig
index 66541b6..1190e969 100644
--- a/src/mainboard/google/dedede/Kconfig
+++ b/src/mainboard/google/dedede/Kconfig
@@ -98,6 +98,7 @@
default "Waddledoo" if BOARD_GOOGLE_WADDLEDOO
default "Waddledee" if BOARD_GOOGLE_WADDLEDEE
default "Wheelie" if BOARD_GOOGLE_WHEELIE
+ default "Lalala" if BOARD_GOOGLE_LALALA
default "Magolor" if BOARD_GOOGLE_MAGOLOR
default "Metaknight" if BOARD_GOOGLE_METAKNIGHT
default "Lantis" if BOARD_GOOGLE_LANTIS
@@ -132,6 +133,7 @@
default "waddledoo" if BOARD_GOOGLE_WADDLEDOO
default "waddledee" if BOARD_GOOGLE_WADDLEDEE
default "wheelie" if BOARD_GOOGLE_WHEELIE
+ default "lalala" if BOARD_GOOGLE_LALALA
default "magolor" if BOARD_GOOGLE_MAGOLOR
default "metaknight" if BOARD_GOOGLE_METAKNIGHT
default "lantis" if BOARD_GOOGLE_LANTIS
diff --git a/src/mainboard/google/dedede/Kconfig.name b/src/mainboard/google/dedede/Kconfig.name
index 5b6a41f..de3a0bd 100644
--- a/src/mainboard/google/dedede/Kconfig.name
+++ b/src/mainboard/google/dedede/Kconfig.name
@@ -62,6 +62,14 @@
select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
select BASEBOARD_DEDEDE_LAPTOP
+config BOARD_GOOGLE_LALALA
+ bool "-> Lalala"
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
+ select BASEBOARD_DEDEDE_LAPTOP
+ select DRIVERS_INTEL_MIPI_CAMERA
+ select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+ select SOC_INTEL_COMMON_BLOCK_IPU
+
config BOARD_GOOGLE_MAGOLOR
bool "-> Magolor"
select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
diff --git a/src/mainboard/google/dedede/variants/lalala/Makefile.inc b/src/mainboard/google/dedede/variants/lalala/Makefile.inc
new file mode 100644
index 0000000..24c75d1
--- /dev/null
+++ b/src/mainboard/google/dedede/variants/lalala/Makefile.inc
@@ -0,0 +1,3 @@
+## SPDX-License-Identifier: GPL-2.0-or-later
+
+ramstage-$(CONFIG_FW_CONFIG) += variant.c
diff --git a/src/mainboard/google/dedede/variants/lalala/include/variant/ec.h b/src/mainboard/google/dedede/variants/lalala/include/variant/ec.h
new file mode 100644
index 0000000..27c930d
--- /dev/null
+++ b/src/mainboard/google/dedede/variants/lalala/include/variant/ec.h
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef MAINBOARD_EC_H
+#define MAINBOARD_EC_H
+
+#include <baseboard/ec.h>
+
+/* Enable Keyboard Backlight in ACPI */
+#define EC_ENABLE_KEYBOARD_BACKLIGHT
+
+#endif
diff --git a/src/mainboard/google/dedede/variants/lalala/include/variant/gpio.h b/src/mainboard/google/dedede/variants/lalala/include/variant/gpio.h
new file mode 100644
index 0000000..9078664
--- /dev/null
+++ b/src/mainboard/google/dedede/variants/lalala/include/variant/gpio.h
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef MAINBOARD_GPIO_H
+#define MAINBOARD_GPIO_H
+
+#include <baseboard/gpio.h>
+
+#endif /* MAINBOARD_GPIO_H */
diff --git a/src/mainboard/google/dedede/variants/lalala/memory/Makefile.inc b/src/mainboard/google/dedede/variants/lalala/memory/Makefile.inc
new file mode 100644
index 0000000..285df73
--- /dev/null
+++ b/src/mainboard/google/dedede/variants/lalala/memory/Makefile.inc
@@ -0,0 +1,7 @@
+## SPDX-License-Identifier: GPL-2.0-or-later
+## This is an auto-generated file. Do not edit!!
+
+SPD_SOURCES =
+SPD_SOURCES += lp4x-spd-1.hex # ID = 0(0b0000) Parts = MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, H9HCNNNBKMMLXR-NEE
+SPD_SOURCES += lp4x-spd-4.hex # ID = 1(0b0001) Parts = MT53E1G32D2NP-046 WT:A
+SPD_SOURCES += lp4x-spd-3.hex # ID = 2(0b0010) Parts = K4UBE3D4AA-MGCR
diff --git a/src/mainboard/google/dedede/variants/lalala/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/lalala/memory/dram_id.generated.txt
new file mode 100644
index 0000000..100c322
--- /dev/null
+++ b/src/mainboard/google/dedede/variants/lalala/memory/dram_id.generated.txt
@@ -0,0 +1,6 @@
+DRAM Part Name ID to assign
+MT53E512M32D2NP-046 WT:E 0 (0000)
+K4U6E3S4AA-MGCR 0 (0000)
+H9HCNNNBKMMLXR-NEE 0 (0000)
+MT53E1G32D2NP-046 WT:A 1 (0001)
+K4UBE3D4AA-MGCR 2 (0010)
diff --git a/src/mainboard/google/dedede/variants/lalala/memory/mem_list_variant.txt b/src/mainboard/google/dedede/variants/lalala/memory/mem_list_variant.txt
new file mode 100644
index 0000000..f05a5af
--- /dev/null
+++ b/src/mainboard/google/dedede/variants/lalala/memory/mem_list_variant.txt
@@ -0,0 +1,5 @@
+MT53E512M32D2NP-046 WT:E
+K4U6E3S4AA-MGCR
+H9HCNNNBKMMLXR-NEE
+MT53E1G32D2NP-046 WT:A
+K4UBE3D4AA-MGCR
diff --git a/src/mainboard/google/dedede/variants/lalala/overridetree.cb b/src/mainboard/google/dedede/variants/lalala/overridetree.cb
new file mode 100644
index 0000000..5f83e4f
--- /dev/null
+++ b/src/mainboard/google/dedede/variants/lalala/overridetree.cb
@@ -0,0 +1,307 @@
+chip soc/intel/jasperlake
+
+ # USB Port Configuration
+ register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" # Camera
+
+ # Intel Common SoC Config
+ #+-------------------+---------------------------+
+ #| Field | Value |
+ #+-------------------+---------------------------+
+ #| I2C0 | Trackpad |
+ #| I2C1 | TBD |
+ #| I2C2 | Touchscreen |
+ #| I2C3 | Camera |
+ #| I2C4 | Audio |
+ #| I2C5 | TBD |
+ #+-------------------+---------------------------+
+ register "common_soc_config" = "{
+ .i2c[0] = {
+ .speed = I2C_SPEED_FAST,
+ .speed_config[0] = {
+ .speed = I2C_SPEED_FAST,
+ .scl_lcnt = 190,
+ .scl_hcnt = 100,
+ .sda_hold = 40,
+ }
+ },
+ .i2c[1] = {
+ .speed = I2C_SPEED_FAST,
+ },
+ .i2c[2] = {
+ .speed = I2C_SPEED_FAST,
+ .speed_config[0] = {
+ .speed = I2C_SPEED_FAST,
+ .scl_lcnt = 190,
+ .scl_hcnt = 100,
+ .sda_hold = 40,
+ }
+ },
+ .i2c[3] = {
+ .speed = I2C_SPEED_FAST,
+ .speed_config[0] = {
+ .speed = I2C_SPEED_FAST,
+ .scl_lcnt = 190,
+ .scl_hcnt = 100,
+ .sda_hold = 40,
+ }
+ },
+ .i2c[4] = {
+ .speed = I2C_SPEED_FAST,
+ .speed_config[0] = {
+ .speed = I2C_SPEED_FAST,
+ .scl_lcnt = 190,
+ .scl_hcnt = 100,
+ .sda_hold = 40,
+ }
+ },
+ }"
+
+ register "power_limits_config" = "{
+ .tdp_pl1_override = 7,
+ .tdp_pl2_override = 12,
+ }"
+
+ register "tcc_offset" = "15" # TCC of 90C
+
+ # Enable Acoustic noise mitigation and set slew rate to 1/8
+ # Rest of the parameters are 0 by default.
+ register "AcousticNoiseMitigation" = "1"
+ register "SlowSlewRate" = "SlewRateFastBy8"
+ register "FastPkgCRampDisable" = "1"
+
+ device domain 0 on
+ device pci 04.0 on
+ chip drivers/intel/dptf
+ register "options.tsr[0].desc" = ""Memory""
+ register "options.tsr[1].desc" = ""Ambient""
+
+ register "policies.passive" = "{
+ [0] = DPTF_PASSIVE(CPU, CPU, 90, 5000),
+ [1] = DPTF_PASSIVE(CPU, TEMP_SENSOR_0, 70, 6000),
+ [2] = DPTF_PASSIVE(CPU, TEMP_SENSOR_1, 60, 5000)}"
+ register "policies.critical" = "{
+ [0] = DPTF_CRITICAL(CPU, 105, SHUTDOWN),
+ [1] = DPTF_CRITICAL(TEMP_SENSOR_0, 80, SHUTDOWN),
+ [2] = DPTF_CRITICAL(TEMP_SENSOR_1, 80, SHUTDOWN)}"
+ register "controls.power_limits.pl1" = "{
+ .min_power = 3000,
+ .max_power = 7000,
+ .time_window_min = 1 * MSECS_PER_SEC,
+ .time_window_max = 1 * MSECS_PER_SEC,
+ .granularity = 200,}"
+ register "controls.power_limits.pl2" = "{
+ .min_power = 12000,
+ .max_power = 12000,
+ .time_window_min = 1 * MSECS_PER_SEC,
+ .time_window_max = 1 * MSECS_PER_SEC,
+ .granularity = 1000,}"
+
+ ## Charger Performance Control (Control, mA)
+ register "controls.charger_perf[0]" = "{ 255, 3000 }"
+ register "controls.charger_perf[1]" = "{ 24, 1500 }"
+ register "controls.charger_perf[2]" = "{ 16, 1000 }"
+ register "controls.charger_perf[3]" = "{ 8, 500 }"
+
+ device generic 0 on end
+ end
+ end # SA Thermal device
+ device pci 05.0 on # IPU - MIPI Camera
+ chip drivers/intel/mipi_camera
+ register "acpi_uid" = "0x50000"
+ register "acpi_name" = ""IPU0""
+ register "device_type" = "INTEL_ACPI_CAMERA_CIO2"
+
+ register "cio2_num_ports" = "1"
+ register "cio2_lanes_used" = "{2}"
+ register "cio2_lane_endpoint[0]" = ""^I2C3.CAM0""
+ register "cio2_prt[0]" = "2"
+ device generic 0 on end
+ end
+ end
+ device pci 14.0 on
+ chip drivers/usb/acpi
+ device usb 0.0 on
+ chip drivers/usb/acpi
+ register "desc" = ""Camera""
+ register "type" = "UPC_TYPE_INTERNAL"
+ device usb 2.5 on end
+ end
+ end
+ end
+ end # USB xHCI
+ device pci 15.0 on
+ chip drivers/i2c/hid
+ register "generic.hid" = ""PNP0C50""
+ register "generic.desc" = ""Synaptics Touchpad""
+ register "generic.irq" = "ACPI_IRQ_WAKE_LEVEL_LOW(GPP_B3_IRQ)"
+ register "generic.wake" = "GPE0_DW0_03"
+ register "generic.probed" = "1"
+ register "hid_desc_reg_offset" = "0x20"
+ device i2c 0x2c on end
+ end
+ chip drivers/i2c/generic
+ register "hid" = ""ELAN0000""
+ register "desc" = ""ELAN Touchpad""
+ register "irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPP_B3_IRQ)"
+ register "wake" = "GPE0_DW0_03"
+ register "probed" = "1"
+ device i2c 15 on end
+ end
+ end # I2C 0
+ device pci 15.2 on
+ chip drivers/i2c/hid
+ register "generic.hid" = ""ELAN6915""
+ register "generic.desc" = ""ELAN Touchscreen""
+ register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_D4_IRQ)"
+ register "generic.probed" = "1"
+ register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D5)"
+ register "generic.reset_delay_ms" = "20"
+ register "generic.reset_off_delay_ms" = "2"
+ register "generic.stop_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_A11)"
+ register "generic.stop_delay_ms" = "280"
+ register "generic.stop_off_delay_ms" = "2"
+ register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D6)"
+ register "generic.enable_delay_ms" = "1"
+ register "generic.has_power_resource" = "1"
+ register "generic.disable_gpio_export_in_crs" = "1"
+ register "hid_desc_reg_offset" = "0x01"
+ device i2c 15 on end
+ end
+ chip drivers/i2c/generic
+ register "hid" = ""ELAN0001""
+ register "desc" = ""ELAN Touchscreen""
+ register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_D4_IRQ)"
+ register "probed" = "1"
+ register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D5)"
+ register "reset_delay_ms" = "20"
+ register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D6)"
+ register "enable_delay_ms" = "1"
+ register "has_power_resource" = "1"
+ device i2c 10 on end
+ end
+ chip drivers/i2c/generic
+ register "hid" = ""RAYD0001""
+ register "desc" = ""Raydium Touchscreen""
+ register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_D4_IRQ)"
+ register "probed" = "1"
+ register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D5)"
+ register "reset_delay_ms" = "100"
+ register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D6)"
+ register "enable_delay_ms" = "50"
+ register "has_power_resource" = "1"
+ register "disable_gpio_export_in_crs" = "1"
+ device i2c 39 on end
+ end
+ end # I2C 2
+ device pci 15.3 on # I2C 3
+ chip drivers/intel/mipi_camera
+ register "acpi_hid" = ""OVTI5675""
+ register "acpi_uid" = "0"
+ register "acpi_name" = ""CAM0""
+ register "chip_name" = ""Ov 5675 Camera""
+ register "device_type" = "INTEL_ACPI_CAMERA_SENSOR"
+
+ register "ssdb.lanes_used" = "2"
+ register "ssdb.link_used" = "1"
+ register "ssdb.vcm_type" = "0x0C"
+ register "vcm_name" = ""VCM0""
+ register "num_freq_entries" = "1"
+ register "link_freq[0]" = "DEFAULT_LINK_FREQ"
+ register "remote_name" = ""IPU0""
+
+ register "has_power_resource" = "1"
+ #Controls
+ register "clk_panel.clks[0].clknum" = "1" #IMGCLKOUT_1
+ register "clk_panel.clks[0].freq" = "1" #19.2 Mhz
+
+ register "gpio_panel.gpio[0].gpio_num" = "GPP_D13" #power_enable_2p8
+ register "gpio_panel.gpio[1].gpio_num" = "GPP_D14" #power_enable_1p2
+ register "gpio_panel.gpio[2].gpio_num" = "GPP_D12" #reset
+
+ #_ON
+ register "on_seq.ops_cnt" = "5"
+ register "on_seq.ops[0]" = "SEQ_OPS_CLK_ENABLE(0, 0)"
+ register "on_seq.ops[1]" = "SEQ_OPS_GPIO_ENABLE(0, 5)"
+ register "on_seq.ops[2]" = "SEQ_OPS_GPIO_ENABLE(1, 5)"
+ register "on_seq.ops[3]" = "SEQ_OPS_GPIO_DISABLE(2, 5)"
+ register "on_seq.ops[4]" = "SEQ_OPS_GPIO_ENABLE(2, 5)"
+
+ #_OFF
+ register "off_seq.ops_cnt" = "4"
+ register "off_seq.ops[0]" = "SEQ_OPS_CLK_DISABLE(0, 0)"
+ register "off_seq.ops[1]" = "SEQ_OPS_GPIO_DISABLE(2, 0)"
+ register "off_seq.ops[2]" = "SEQ_OPS_GPIO_DISABLE(1, 0)"
+ register "off_seq.ops[3]" = "SEQ_OPS_GPIO_DISABLE(0, 0)"
+
+ device i2c 36 on end
+ end
+ chip drivers/intel/mipi_camera
+ register "acpi_uid" = "3"
+ register "acpi_name" = ""VCM0""
+ register "chip_name" = ""DW AF DAC""
+ register "device_type" = "INTEL_ACPI_CAMERA_VCM"
+
+ register "pr0" = ""\\_SB.PCI0.I2C3.CAM0.PRIC""
+ register "vcm_compat" = ""dongwoon,dw9714""
+
+ device i2c 0C on end
+
+ end
+ chip drivers/intel/mipi_camera
+ register "acpi_hid" = "ACPI_DT_NAMESPACE_HID"
+ register "acpi_uid" = "1"
+ register "acpi_name" = ""NVM0""
+ register "chip_name" = ""GT24C08""
+ register "device_type" = "INTEL_ACPI_CAMERA_NVM"
+
+ register "pr0" = ""\\_SB.PCI0.I2C3.CAM0.PRIC""
+
+ register "nvm_size" = "0x2000"
+ register "nvm_pagesize" = "1"
+ register "nvm_readonly" = "1"
+ register "nvm_width" = "0x10"
+ register "nvm_compat" = ""atmel,24c08""
+
+ device i2c 50 on end
+ end
+ end
+ device pci 19.0 on
+ chip drivers/i2c/generic
+ register "hid" = ""10EC5682""
+ register "name" = ""RT58""
+ register "desc" = ""Realtek RT5682""
+ register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(GPP_D16)"
+ register "property_count" = "1"
+ register "property_list[0].type" = "ACPI_DP_TYPE_INTEGER"
+ register "property_list[0].name" = ""realtek,jd-src""
+ register "property_list[0].integer" = "1"
+ device i2c 1a on end
+ end
+ chip drivers/i2c/generic
+ register "hid" = ""10EC1015""
+ register "desc" = ""Realtek SPK AMP L""
+ register "uid" = "0"
+ device i2c 28 on end
+ end
+ chip drivers/i2c/generic
+ register "hid" = ""10EC1015""
+ register "desc" = ""Realtek SPK AMP R""
+ register "uid" = "1"
+ device i2c 29 on end
+ end
+ end
+ device pci 1e.2 off end # GSPI 0
+ device pci 1f.3 on end # Intel HDA
+ device pci 1f.5 on
+ chip drivers/pc80/tpm
+ device pnp 0c31.0 on end # Discrete TPM
+ end # chip drivers/pc80/tpm
+ end # PCH SPI
+ device pci 1c.7 on
+ chip drivers/wifi/generic
+ register "wake" = "GPE0_DW2_03"
+ device pci 00.0 on end
+ end
+ end # PCI Express Root Port 8 - WLAN
+ end
+end
diff --git a/src/mainboard/google/dedede/variants/lalala/variant.c b/src/mainboard/google/dedede/variants/lalala/variant.c
new file mode 100644
index 0000000..8bbae62
--- /dev/null
+++ b/src/mainboard/google/dedede/variants/lalala/variant.c
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <fw_config.h>
+#include <sar.h>
+
+const char *get_wifi_sar_cbfs_filename(void)
+{
+ if (fw_config_probe(FW_CONFIG(TABLETMODE, TABLETMODE_ENABLED)))
+ return "wifi_sar-lalala.hex";
+
+ return WIFI_SAR_CBFS_DEFAULT_FILENAME;
+}
To view, visit change 52031. To unsubscribe, or for help writing mail filters, visit settings.