From a4a356011b7f26d5306241753960570dab4cdfc2 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 5 Oct 2020 12:35:57 -0600 Subject: [PATCH] Sync addw1 with addw2 Change-Id: Ie4bf24567eb3da046e6b2102e61db697e7c0f932 --- src/mainboard/system76/addw1/Kconfig | 9 +-------- src/mainboard/system76/addw1/devicetree.cb | 1 + src/mainboard/system76/addw2/devicetree.cb | 2 +- src/mainboard/system76/addw2/tas5825m.c | 3 ++- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/mainboard/system76/addw1/Kconfig b/src/mainboard/system76/addw1/Kconfig index 400af6501b..d386d2a3fb 100644 --- a/src/mainboard/system76/addw1/Kconfig +++ b/src/mainboard/system76/addw1/Kconfig @@ -7,6 +7,7 @@ config BOARD_SPECIFIC_OPTIONS select DRIVERS_I2C_TAS5825M select DRIVERS_SYSTEM76_DGPU select EC_SYSTEM76_EC + select EC_SYSTEM76_EC_BAT_THRESHOLDS select EC_SYSTEM76_EC_COLOR_KEYBOARD select EC_SYSTEM76_EC_DGPU select EC_SYSTEM76_EC_OLED @@ -48,14 +49,6 @@ config CBFS_SIZE hex default 0xA00000 -config SUBSYSTEM_VENDOR_ID - hex - default 0x1558 - -config SUBSYSTEM_DEVICE_ID - hex - default 0x65d1 - config CONSOLE_POST bool default y diff --git a/src/mainboard/system76/addw1/devicetree.cb b/src/mainboard/system76/addw1/devicetree.cb index 036753ebc9..0cbf653e61 100644 --- a/src/mainboard/system76/addw1/devicetree.cb +++ b/src/mainboard/system76/addw1/devicetree.cb @@ -243,6 +243,7 @@ chip soc/intel/cannonlake end device domain 0 on + subsystemid 0x1558 0x65e1 inherit device pci 00.0 on end # Host Bridge device pci 01.0 on end # GPU Port device pci 02.0 on end # Integrated Graphics Device diff --git a/src/mainboard/system76/addw2/devicetree.cb b/src/mainboard/system76/addw2/devicetree.cb index a5708b6ad4..345d6ecdb3 100644 --- a/src/mainboard/system76/addw2/devicetree.cb +++ b/src/mainboard/system76/addw2/devicetree.cb @@ -220,7 +220,7 @@ chip soc/intel/cannonlake register "gen4_dec" = "0x00fc0F01" # PMC (soc/intel/cannonlake/pmc.c) - # Enable deep Sx states + # Disable deep Sx states register "deep_s3_enable_ac" = "0" register "deep_s3_enable_dc" = "0" register "deep_s5_enable_ac" = "0" diff --git a/src/mainboard/system76/addw2/tas5825m.c b/src/mainboard/system76/addw2/tas5825m.c index b8b44c637b..7efd7b1c41 100644 --- a/src/mainboard/system76/addw2/tas5825m.c +++ b/src/mainboard/system76/addw2/tas5825m.c @@ -17,7 +17,8 @@ #define amp_set_book(B) R(tas5825m_set_book(dev, B)) -int tas5825m_setup(struct device * dev, int id) { +int tas5825m_setup(struct device * dev, int id) +{ int res = 0; amp_set_book(0x00);