mb/system76: Convert to devicetree subsystemid
Upstream has converted all uses of SUBSYSTEM_{VENDOR,DEVICE}_ID in
Kconfig to subsystemid in devicetree. It will soon produce a lint error
from Jenkins [1].
[1]: https://review.coreboot.org/c/coreboot/+/45513/
Change-Id: I66d5d5f23d3c8ab6ed79dad432a0773841147eea
Signed-off-by: Tim Crawford <tcrawford@system76.com>
This commit is contained in:
Tim Crawford
committed by
Jeremy Soller
Jeremy Soller
parent
7ba5665046
commit
1853d8737b
@@ -48,14 +48,6 @@ config CBFS_SIZE
|
||||
hex
|
||||
default 0xA00000
|
||||
|
||||
config SUBSYSTEM_VENDOR_ID
|
||||
hex
|
||||
default 0x1558
|
||||
|
||||
config SUBSYSTEM_DEVICE_ID
|
||||
hex
|
||||
default 0x65e1
|
||||
|
||||
config CONSOLE_POST
|
||||
bool
|
||||
default y
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -23,7 +23,7 @@ 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
|
||||
select TPM_RDRESP_NEED_DELAY
|
||||
select USE_LEGACY_8254_TIMER # Fix failure to boot GRUB
|
||||
|
||||
# Hack for correct FSP headers until coreboot is updated
|
||||
@@ -54,14 +54,6 @@ config CBFS_SIZE
|
||||
hex
|
||||
default 0xA00000
|
||||
|
||||
config SUBSYSTEM_VENDOR_ID
|
||||
hex
|
||||
default 0x1558
|
||||
|
||||
config SUBSYSTEM_DEVICE_ID
|
||||
hex
|
||||
default 0x7714
|
||||
|
||||
config CONSOLE_POST
|
||||
bool
|
||||
default y
|
||||
|
||||
@@ -232,6 +232,7 @@ chip soc/intel/cannonlake
|
||||
end
|
||||
|
||||
device domain 0 on
|
||||
subsystemid 0x1558 0x7714 inherit
|
||||
device pci 00.0 on end # Host Bridge
|
||||
device pci 01.0 on end # GPU Port
|
||||
#TODO: is this enough to disable iGPU?
|
||||
|
||||
@@ -49,15 +49,6 @@ config CBFS_SIZE
|
||||
hex
|
||||
default 0xA00000
|
||||
|
||||
config SUBSYSTEM_VENDOR_ID
|
||||
hex
|
||||
default 0x1558
|
||||
|
||||
config SUBSYSTEM_DEVICE_ID
|
||||
hex
|
||||
default 0x1403 if BOARD_SYSTEM76_GALP4
|
||||
default 0x1404 if BOARD_SYSTEM76_DARP6
|
||||
|
||||
config CONSOLE_POST
|
||||
bool
|
||||
default y
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
chip soc/intel/cannonlake
|
||||
device domain 0 on
|
||||
subsystemid 0x1558 0x1404 inherit
|
||||
device pci 15.0 on
|
||||
chip drivers/i2c/hid
|
||||
register "generic.hid" = ""PNP0C50""
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
chip soc/intel/cannonlake
|
||||
device domain 0 on
|
||||
subsystemid 0x1558 0x1403 inherit
|
||||
device pci 15.0 on
|
||||
# I2C HID not supported on galp4
|
||||
end # I2C #0
|
||||
|
||||
@@ -48,17 +48,6 @@ config CBFS_SIZE
|
||||
hex
|
||||
default 0xA00000
|
||||
|
||||
config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
|
||||
hex
|
||||
default 0x1558
|
||||
|
||||
config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
|
||||
hex
|
||||
default 0x8560 if BOARD_SYSTEM76_GAZE14_1650_15
|
||||
default 0x8561 if BOARD_SYSTEM76_GAZE14_1650_17
|
||||
default 0x8550 if BOARD_SYSTEM76_GAZE14_1660TI_15
|
||||
default 0x8551 if BOARD_SYSTEM76_GAZE14_1660TI_17
|
||||
|
||||
config CONSOLE_POST
|
||||
bool
|
||||
default y
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
chip soc/intel/cannonlake
|
||||
device domain 0 on
|
||||
subsystemid 0x1558 0x8560 inherit
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,5 @@
|
||||
chip soc/intel/cannonlake
|
||||
device domain 0 on
|
||||
subsystemid 0x1558 0x8561 inherit
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,5 @@
|
||||
chip soc/intel/cannonlake
|
||||
device domain 0 on
|
||||
subsystemid 0x1558 0x8550 inherit
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,5 @@
|
||||
chip soc/intel/cannonlake
|
||||
device domain 0 on
|
||||
subsystemid 0x1558 0x8551 inherit
|
||||
end
|
||||
end
|
||||
@@ -45,14 +45,6 @@ config CBFS_SIZE
|
||||
hex
|
||||
default 0xA00000
|
||||
|
||||
config SUBSYSTEM_VENDOR_ID
|
||||
hex
|
||||
default 0x1558
|
||||
|
||||
config SUBSYSTEM_DEVICE_ID
|
||||
hex
|
||||
default 0x8520
|
||||
|
||||
config CONSOLE_POST
|
||||
bool
|
||||
default y
|
||||
|
||||
@@ -235,6 +235,7 @@ chip soc/intel/cannonlake
|
||||
end
|
||||
|
||||
device domain 0 on
|
||||
subsystemid 0x1558 0x8520 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
|
||||
|
||||
@@ -44,16 +44,6 @@ config CBFS_SIZE
|
||||
hex
|
||||
default 0x600000
|
||||
|
||||
config SUBSYSTEM_VENDOR_ID
|
||||
hex
|
||||
default 0x1558
|
||||
|
||||
config SUBSYSTEM_DEVICE_ID
|
||||
hex
|
||||
default 0x1303 if BOARD_SYSTEM76_GALP2
|
||||
default 0x1313 if BOARD_SYSTEM76_GALP3
|
||||
default 0x1413 if BOARD_SYSTEM76_GALP3_B
|
||||
|
||||
config CONSOLE_POST
|
||||
bool
|
||||
default y
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
chip soc/intel/skylake
|
||||
device domain 0 on
|
||||
subsystemid 0x1558 0x1303 inherit
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,5 @@
|
||||
chip soc/intel/skylake
|
||||
device domain 0 on
|
||||
subsystemid 0x1558 0x1413 inherit
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,5 @@
|
||||
chip soc/intel/skylake
|
||||
device domain 0 on
|
||||
subsystemid 0x1558 0x1313 inherit
|
||||
end
|
||||
end
|
||||
@@ -42,14 +42,6 @@ config CBFS_SIZE
|
||||
hex
|
||||
default 0xA00000
|
||||
|
||||
config SUBSYSTEM_VENDOR_ID
|
||||
hex
|
||||
default 0x1558
|
||||
|
||||
config SUBSYSTEM_DEVICE_ID
|
||||
hex
|
||||
default 0x1401
|
||||
|
||||
config CONSOLE_POST
|
||||
bool
|
||||
default y
|
||||
|
||||
@@ -186,6 +186,7 @@ chip soc/intel/cannonlake
|
||||
end
|
||||
|
||||
device domain 0 on
|
||||
subsystemid 0x1558 0x1401 inherit
|
||||
device pci 00.0 on end # Host Bridge
|
||||
device pci 02.0 on end # Integrated Graphics Device
|
||||
device pci 04.0 on end # SA Thermal device
|
||||
|
||||
@@ -47,14 +47,6 @@ config CBFS_SIZE
|
||||
hex
|
||||
default 0xA00000
|
||||
|
||||
config SUBSYSTEM_VENDOR_ID
|
||||
hex
|
||||
default 0x1558
|
||||
|
||||
config SUBSYSTEM_DEVICE_ID
|
||||
hex
|
||||
default 0x50d3
|
||||
|
||||
config CONSOLE_POST
|
||||
bool
|
||||
default y
|
||||
|
||||
@@ -246,6 +246,7 @@ chip soc/intel/cannonlake
|
||||
end
|
||||
|
||||
device domain 0 on
|
||||
subsystemid 0x1558 0x50d3 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
|
||||
|
||||
@@ -34,14 +34,6 @@ config CBFS_SIZE
|
||||
hex
|
||||
default 0xA00000
|
||||
|
||||
config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
|
||||
hex
|
||||
default 0x1458
|
||||
|
||||
config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
|
||||
hex
|
||||
default 0xa0c3
|
||||
|
||||
config CONSOLE_POST
|
||||
bool
|
||||
default y
|
||||
|
||||
@@ -180,6 +180,7 @@ chip soc/intel/cannonlake
|
||||
end
|
||||
|
||||
device domain 0 on
|
||||
subsystemid 0x1458 0xa0c3 inherit
|
||||
device pci 00.0 on end # Host Bridge
|
||||
device pci 02.0 on end # Integrated Graphics Device
|
||||
device pci 04.0 off end # SA Thermal device
|
||||
|
||||
@@ -49,15 +49,6 @@ config CBFS_SIZE
|
||||
hex
|
||||
default 0xA00000
|
||||
|
||||
config SUBSYSTEM_VENDOR_ID
|
||||
hex
|
||||
default 0x1558
|
||||
|
||||
config SUBSYSTEM_DEVICE_ID
|
||||
hex
|
||||
default 0x1323 if BOARD_SYSTEM76_GALP3_C
|
||||
default 0x1325 if BOARD_SYSTEM76_DARP5
|
||||
|
||||
config CONSOLE_POST
|
||||
bool
|
||||
default y
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
chip soc/intel/cannonlake
|
||||
device domain 0 on
|
||||
subsystemid 0x1558 0x1325 inherit
|
||||
device pci 15.0 on
|
||||
chip drivers/i2c/hid
|
||||
register "generic.hid" = ""PNP0C50""
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
chip soc/intel/cannonlake
|
||||
device domain 0 on
|
||||
subsystemid 0x1558 0x1323 inherit
|
||||
device pci 15.0 on
|
||||
# I2C HID not supported on galp3-c
|
||||
end # I2C #0
|
||||
|
||||
Reference in New Issue
Block a user