Sync addw1 with addw2

Change-Id: Ie4bf24567eb3da046e6b2102e61db697e7c0f932
This commit is contained in:
Jeremy Soller
2020-10-05 12:35:57 -06:00
committed by Jeremy Soller
parent 84bb9befff
commit a4a356011b
4 changed files with 5 additions and 10 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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"

View File

@@ -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);