From 1853d8737b39f444eb6e66173be5520060b19321 Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Sat, 19 Sep 2020 17:57:18 -0600 Subject: [PATCH] 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 --- src/mainboard/system76/addw2/Kconfig | 8 -------- src/mainboard/system76/addw2/devicetree.cb | 1 + src/mainboard/system76/bonw14/Kconfig | 10 +--------- src/mainboard/system76/bonw14/devicetree.cb | 1 + src/mainboard/system76/cml-u/Kconfig | 9 --------- .../system76/cml-u/variants/darp6/overridetree.cb | 1 + .../system76/cml-u/variants/galp4/overridetree.cb | 1 + src/mainboard/system76/gaze14/Kconfig | 11 ----------- .../gaze14/variants/gaze14_1650_15/overridetree.cb | 5 +++++ .../gaze14/variants/gaze14_1650_17/overridetree.cb | 5 +++++ .../gaze14/variants/gaze14_1660ti_15/overridetree.cb | 5 +++++ .../gaze14/variants/gaze14_1660ti_17/overridetree.cb | 5 +++++ src/mainboard/system76/gaze15/Kconfig | 8 -------- src/mainboard/system76/gaze15/devicetree.cb | 1 + src/mainboard/system76/kbl-u/Kconfig | 10 ---------- .../system76/kbl-u/variants/galp2/overridetree.cb | 5 +++++ .../system76/kbl-u/variants/galp3-b/overridetree.cb | 5 +++++ .../system76/kbl-u/variants/galp3/overridetree.cb | 5 +++++ src/mainboard/system76/lemp9/Kconfig | 8 -------- src/mainboard/system76/lemp9/devicetree.cb | 1 + src/mainboard/system76/oryp6/Kconfig | 8 -------- src/mainboard/system76/oryp6/devicetree.cb | 1 + src/mainboard/system76/thelio-b1/Kconfig | 8 -------- src/mainboard/system76/thelio-b1/devicetree.cb | 1 + src/mainboard/system76/whl-u/Kconfig | 9 --------- .../system76/whl-u/variants/darp5/overridetree.cb | 1 + .../system76/whl-u/variants/galp3-c/overridetree.cb | 1 + 27 files changed, 46 insertions(+), 88 deletions(-) create mode 100644 src/mainboard/system76/gaze14/variants/gaze14_1650_15/overridetree.cb create mode 100644 src/mainboard/system76/gaze14/variants/gaze14_1650_17/overridetree.cb create mode 100644 src/mainboard/system76/gaze14/variants/gaze14_1660ti_15/overridetree.cb create mode 100644 src/mainboard/system76/gaze14/variants/gaze14_1660ti_17/overridetree.cb create mode 100644 src/mainboard/system76/kbl-u/variants/galp2/overridetree.cb create mode 100644 src/mainboard/system76/kbl-u/variants/galp3-b/overridetree.cb create mode 100644 src/mainboard/system76/kbl-u/variants/galp3/overridetree.cb diff --git a/src/mainboard/system76/addw2/Kconfig b/src/mainboard/system76/addw2/Kconfig index 9b04f71069..ea111cc4ae 100644 --- a/src/mainboard/system76/addw2/Kconfig +++ b/src/mainboard/system76/addw2/Kconfig @@ -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 diff --git a/src/mainboard/system76/addw2/devicetree.cb b/src/mainboard/system76/addw2/devicetree.cb index 0e143f8d9d..a5708b6ad4 100644 --- a/src/mainboard/system76/addw2/devicetree.cb +++ b/src/mainboard/system76/addw2/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/bonw14/Kconfig b/src/mainboard/system76/bonw14/Kconfig index f45bb15a0f..dcfef95b06 100644 --- a/src/mainboard/system76/bonw14/Kconfig +++ b/src/mainboard/system76/bonw14/Kconfig @@ -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 diff --git a/src/mainboard/system76/bonw14/devicetree.cb b/src/mainboard/system76/bonw14/devicetree.cb index bc82781049..2447d36762 100644 --- a/src/mainboard/system76/bonw14/devicetree.cb +++ b/src/mainboard/system76/bonw14/devicetree.cb @@ -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? diff --git a/src/mainboard/system76/cml-u/Kconfig b/src/mainboard/system76/cml-u/Kconfig index 66a187a1e1..8ba153e6a6 100644 --- a/src/mainboard/system76/cml-u/Kconfig +++ b/src/mainboard/system76/cml-u/Kconfig @@ -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 diff --git a/src/mainboard/system76/cml-u/variants/darp6/overridetree.cb b/src/mainboard/system76/cml-u/variants/darp6/overridetree.cb index 6bbb67d540..1723cea480 100644 --- a/src/mainboard/system76/cml-u/variants/darp6/overridetree.cb +++ b/src/mainboard/system76/cml-u/variants/darp6/overridetree.cb @@ -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"" diff --git a/src/mainboard/system76/cml-u/variants/galp4/overridetree.cb b/src/mainboard/system76/cml-u/variants/galp4/overridetree.cb index 986c7b9a6d..f6c61498be 100644 --- a/src/mainboard/system76/cml-u/variants/galp4/overridetree.cb +++ b/src/mainboard/system76/cml-u/variants/galp4/overridetree.cb @@ -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 diff --git a/src/mainboard/system76/gaze14/Kconfig b/src/mainboard/system76/gaze14/Kconfig index a9bfe93959..b100e69204 100644 --- a/src/mainboard/system76/gaze14/Kconfig +++ b/src/mainboard/system76/gaze14/Kconfig @@ -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 diff --git a/src/mainboard/system76/gaze14/variants/gaze14_1650_15/overridetree.cb b/src/mainboard/system76/gaze14/variants/gaze14_1650_15/overridetree.cb new file mode 100644 index 0000000000..edb6ab31f5 --- /dev/null +++ b/src/mainboard/system76/gaze14/variants/gaze14_1650_15/overridetree.cb @@ -0,0 +1,5 @@ +chip soc/intel/cannonlake + device domain 0 on + subsystemid 0x1558 0x8560 inherit + end +end diff --git a/src/mainboard/system76/gaze14/variants/gaze14_1650_17/overridetree.cb b/src/mainboard/system76/gaze14/variants/gaze14_1650_17/overridetree.cb new file mode 100644 index 0000000000..e35187ae59 --- /dev/null +++ b/src/mainboard/system76/gaze14/variants/gaze14_1650_17/overridetree.cb @@ -0,0 +1,5 @@ +chip soc/intel/cannonlake + device domain 0 on + subsystemid 0x1558 0x8561 inherit + end +end diff --git a/src/mainboard/system76/gaze14/variants/gaze14_1660ti_15/overridetree.cb b/src/mainboard/system76/gaze14/variants/gaze14_1660ti_15/overridetree.cb new file mode 100644 index 0000000000..dbdfc85243 --- /dev/null +++ b/src/mainboard/system76/gaze14/variants/gaze14_1660ti_15/overridetree.cb @@ -0,0 +1,5 @@ +chip soc/intel/cannonlake + device domain 0 on + subsystemid 0x1558 0x8550 inherit + end +end diff --git a/src/mainboard/system76/gaze14/variants/gaze14_1660ti_17/overridetree.cb b/src/mainboard/system76/gaze14/variants/gaze14_1660ti_17/overridetree.cb new file mode 100644 index 0000000000..59c6831eae --- /dev/null +++ b/src/mainboard/system76/gaze14/variants/gaze14_1660ti_17/overridetree.cb @@ -0,0 +1,5 @@ +chip soc/intel/cannonlake + device domain 0 on + subsystemid 0x1558 0x8551 inherit + end +end diff --git a/src/mainboard/system76/gaze15/Kconfig b/src/mainboard/system76/gaze15/Kconfig index f61482e14d..f38ad2193f 100644 --- a/src/mainboard/system76/gaze15/Kconfig +++ b/src/mainboard/system76/gaze15/Kconfig @@ -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 diff --git a/src/mainboard/system76/gaze15/devicetree.cb b/src/mainboard/system76/gaze15/devicetree.cb index ee36d9b102..44c4beacb9 100644 --- a/src/mainboard/system76/gaze15/devicetree.cb +++ b/src/mainboard/system76/gaze15/devicetree.cb @@ -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 diff --git a/src/mainboard/system76/kbl-u/Kconfig b/src/mainboard/system76/kbl-u/Kconfig index 41ac3576c6..38d5c7518f 100644 --- a/src/mainboard/system76/kbl-u/Kconfig +++ b/src/mainboard/system76/kbl-u/Kconfig @@ -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 diff --git a/src/mainboard/system76/kbl-u/variants/galp2/overridetree.cb b/src/mainboard/system76/kbl-u/variants/galp2/overridetree.cb new file mode 100644 index 0000000000..9e042a335b --- /dev/null +++ b/src/mainboard/system76/kbl-u/variants/galp2/overridetree.cb @@ -0,0 +1,5 @@ +chip soc/intel/skylake + device domain 0 on + subsystemid 0x1558 0x1303 inherit + end +end diff --git a/src/mainboard/system76/kbl-u/variants/galp3-b/overridetree.cb b/src/mainboard/system76/kbl-u/variants/galp3-b/overridetree.cb new file mode 100644 index 0000000000..134fbec7a7 --- /dev/null +++ b/src/mainboard/system76/kbl-u/variants/galp3-b/overridetree.cb @@ -0,0 +1,5 @@ +chip soc/intel/skylake + device domain 0 on + subsystemid 0x1558 0x1413 inherit + end +end diff --git a/src/mainboard/system76/kbl-u/variants/galp3/overridetree.cb b/src/mainboard/system76/kbl-u/variants/galp3/overridetree.cb new file mode 100644 index 0000000000..8a61f28069 --- /dev/null +++ b/src/mainboard/system76/kbl-u/variants/galp3/overridetree.cb @@ -0,0 +1,5 @@ +chip soc/intel/skylake + device domain 0 on + subsystemid 0x1558 0x1313 inherit + end +end diff --git a/src/mainboard/system76/lemp9/Kconfig b/src/mainboard/system76/lemp9/Kconfig index 628b3a8e5f..d6ea3480e7 100644 --- a/src/mainboard/system76/lemp9/Kconfig +++ b/src/mainboard/system76/lemp9/Kconfig @@ -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 diff --git a/src/mainboard/system76/lemp9/devicetree.cb b/src/mainboard/system76/lemp9/devicetree.cb index 476ed8d03a..92e55c4246 100644 --- a/src/mainboard/system76/lemp9/devicetree.cb +++ b/src/mainboard/system76/lemp9/devicetree.cb @@ -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 diff --git a/src/mainboard/system76/oryp6/Kconfig b/src/mainboard/system76/oryp6/Kconfig index 395268f1d5..48e31e0097 100644 --- a/src/mainboard/system76/oryp6/Kconfig +++ b/src/mainboard/system76/oryp6/Kconfig @@ -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 diff --git a/src/mainboard/system76/oryp6/devicetree.cb b/src/mainboard/system76/oryp6/devicetree.cb index 6e8cd1e738..e62b4eb724 100644 --- a/src/mainboard/system76/oryp6/devicetree.cb +++ b/src/mainboard/system76/oryp6/devicetree.cb @@ -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 diff --git a/src/mainboard/system76/thelio-b1/Kconfig b/src/mainboard/system76/thelio-b1/Kconfig index 74a38ad20e..590d70faa0 100644 --- a/src/mainboard/system76/thelio-b1/Kconfig +++ b/src/mainboard/system76/thelio-b1/Kconfig @@ -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 diff --git a/src/mainboard/system76/thelio-b1/devicetree.cb b/src/mainboard/system76/thelio-b1/devicetree.cb index 9b4af67f6b..35076cdb93 100644 --- a/src/mainboard/system76/thelio-b1/devicetree.cb +++ b/src/mainboard/system76/thelio-b1/devicetree.cb @@ -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 diff --git a/src/mainboard/system76/whl-u/Kconfig b/src/mainboard/system76/whl-u/Kconfig index fd50bbc4e2..ffe8624c60 100644 --- a/src/mainboard/system76/whl-u/Kconfig +++ b/src/mainboard/system76/whl-u/Kconfig @@ -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 diff --git a/src/mainboard/system76/whl-u/variants/darp5/overridetree.cb b/src/mainboard/system76/whl-u/variants/darp5/overridetree.cb index 6bbb67d540..4ae96ff09a 100644 --- a/src/mainboard/system76/whl-u/variants/darp5/overridetree.cb +++ b/src/mainboard/system76/whl-u/variants/darp5/overridetree.cb @@ -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"" diff --git a/src/mainboard/system76/whl-u/variants/galp3-c/overridetree.cb b/src/mainboard/system76/whl-u/variants/galp3-c/overridetree.cb index a57b732a28..022be95787 100644 --- a/src/mainboard/system76/whl-u/variants/galp3-c/overridetree.cb +++ b/src/mainboard/system76/whl-u/variants/galp3-c/overridetree.cb @@ -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