From 438d1b1c1ad23c75279667daa14975c8a6650cec Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Sun, 25 Jan 2026 17:18:02 -0600 Subject: [PATCH] mb/intel/jasperlake_rvp: Use aliases in devicetree MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Convert all PCI device and USB port references in the jasperlake_rvp devicetree to use device aliases from the Jasperlake chipset.cb instead of direct device/function numbers. This improves maintainability by using symbolic names, and reduces file size by eliminating entries which match those in the chipset devicetree. Additionally, the p2sb device reference is dropped, as the correct state (hidden) is set by the chipset devicetree. TEST=Build jslrvp Change-Id: I04fd2d1655f08fb0671deeeb55a3e88eb97b7f44 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/90902 Reviewed-by: Jérémy Compostella Reviewed-by: Sean Rhodes Tested-by: build bot (Jenkins) --- .../variants/jslrvp/devicetree.cb | 98 +++++++------------ 1 file changed, 38 insertions(+), 60 deletions(-) diff --git a/src/mainboard/intel/jasperlake_rvp/variants/jslrvp/devicetree.cb b/src/mainboard/intel/jasperlake_rvp/variants/jslrvp/devicetree.cb index fadd309dab..4b95f52b36 100644 --- a/src/mainboard/intel/jasperlake_rvp/variants/jslrvp/devicetree.cb +++ b/src/mainboard/intel/jasperlake_rvp/variants/jslrvp/devicetree.cb @@ -195,9 +195,8 @@ chip soc/intel/jasperlake register "xhci_lfps_sampling_offtime_ms" = "9" device domain 0 on - device pci 00.0 on end # Host Bridge - device pci 02.0 on end # Integrated Graphics Device - device pci 04.0 on + device ref igpu on end + device ref dptf on chip drivers/intel/dptf register "policies.passive[0]" = "DPTF_PASSIVE(CPU, CPU, 95, 1000)" register "policies.critical[0]" = "DPTF_CRITICAL(CPU, 119, SHUTDOWN)" @@ -216,9 +215,9 @@ chip soc/intel/jasperlake .granularity = 1000,}" device generic 0 on end end - end # SA Thermal device + end - device pci 05.0 on + device ref ipu on chip drivers/intel/mipi_camera register "acpi_uid" = "0x50000" register "acpi_name" = ""IPU0"" @@ -233,97 +232,92 @@ chip soc/intel/jasperlake device generic 0 on end end end - device pci 12.0 off end # Thermal Subsystem - device pci 12.5 off end # UFS SCS - device pci 12.6 off end # GSPI #2 - device pci 14.0 on + device ref south_xhci on chip drivers/usb/acpi register "desc" = ""Root Hub"" register "type" = "UPC_TYPE_HUB" - device usb 0.0 on + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""USB3/2 Type-A Left Lower"" register "type" = "UPC_TYPE_A" - device usb 2.0 on end + device ref usb2_port1 on end end chip drivers/usb/acpi register "desc" = ""WWAN"" register "type" = "UPC_TYPE_INTERNAL" - device usb 2.1 on end + device ref usb2_port2 on end end chip drivers/usb/acpi register "desc" = ""Bluetooth"" register "type" = "UPC_TYPE_INTERNAL" - device usb 2.2 on end + device ref usb2_port3 on end end chip drivers/usb/acpi register "desc" = ""USB C Connector 1"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" - device usb 2.3 on end + device ref usb2_port4 on end end chip drivers/usb/acpi register "desc" = ""USB C Connector 2"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" - device usb 2.4 on end + device ref usb2_port5 on end end chip drivers/usb/acpi register "desc" = ""USB C Connector 3"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" - device usb 2.5 on end + device ref usb2_port6 on end end chip drivers/usb/acpi register "desc" = ""USB C Connector 4"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" - device usb 2.6 on end + device ref usb2_port7 on end end chip drivers/usb/acpi register "desc" = ""USB3/2 Type-A Left Upper"" register "type" = "UPC_TYPE_A" - device usb 2.7 on end + device ref usb2_port8 on end end chip drivers/usb/acpi register "desc" = ""USB3/2 Type-A Left Lower"" register "type" = "UPC_TYPE_A" - device usb 3.0 on end + device ref usb3_port1 on end end chip drivers/usb/acpi register "desc" = ""USB3/2 Type-A Left Upper"" register "type" = "UPC_TYPE_A" - device usb 3.1 on end + device ref usb3_port2 on end end chip drivers/usb/acpi register "desc" = ""WLAN"" register "type" = "UPC_TYPE_INTERNAL" - device usb 3.2 on end + device ref usb3_port3 on end end chip drivers/usb/acpi register "desc" = ""USB3 Port Unused1"" register "type" = "UPC_TYPE_INTERNAL" - device usb 3.3 on end + device ref usb3_port4 on end end chip drivers/usb/acpi register "desc" = ""USB3 Port Unused2"" register "type" = "UPC_TYPE_INTERNAL" - device usb 3.4 on end + device ref usb3_port5 on end end chip drivers/usb/acpi register "desc" = ""USB3 Port Unused3"" register "type" = "UPC_TYPE_INTERNAL" - device usb 3.5 on end + device ref usb3_port6 on end end end end - end # USB xHCI - device pci 14.1 off end # USB xDCI (OTG) - device pci 14.2 off end # PMC SRAM - device pci 14.3 on + end + device ref cnvi_wifi on chip drivers/wifi/generic register "wake" = "GPE0_PME_B0" device generic 0 on end end - end # CNVi wifi - device pci 14.5 on end # SDCard - device pci 15.0 on + end + device ref sdxc on end + device ref i2c0 on chip drivers/i2c/max98373 register "vmon_slot_no" = "4" register "imon_slot_no" = "5" @@ -357,18 +351,9 @@ chip soc/intel/jasperlake register "mic_amp_in_sel" = ""diff"" device i2c 1a on end end - end # I2C #0 Audio - device pci 15.1 off end # I2C #1 - device pci 15.2 off end # I2C #2 - device pci 15.3 off end # I2C #3 - device pci 16.0 on end # Management Engine Interface 1 - device pci 16.1 off end # Management Engine Interface 2 - device pci 16.2 off end # Management Engine IDE-R - device pci 16.3 off end # Management Engine KT Redirection - device pci 16.4 off end # Management Engine Interface 3 - device pci 16.5 off end # Management Engine Interface 4 - device pci 17.0 off end # SATA - device pci 19.0 on # I2C #4 Cam 0 + end + device ref heci1 on end + device ref i2c4 on chip drivers/intel/mipi_camera register "acpi_hid" = ""OVTI2740"" register "acpi_uid" = "0" @@ -407,7 +392,7 @@ chip soc/intel/jasperlake device i2c 10 on end end end - device pci 19.1 on # I2C #5 Cam 1 and VCM + device ref i2c5 on chip drivers/intel/mipi_camera register "acpi_hid" = ""OVTI5675"" register "acpi_uid" = "0" @@ -467,27 +452,20 @@ chip soc/intel/jasperlake end end - device pci 19.2 on end # UART #2 - device pci 1a.0 on end # eMMC - device pci 1c.1 on end # PCI Express Port 2 - M.2 E-key WLAN - device pci 1c.4 on end # PCI Express Port 5 - NVMe - device pci 1e.0 on end # UART #0 - device pci 1e.1 off end # UART #1 - device pci 1e.2 off end # GSPI #0 - device pci 1e.3 on + device ref uart2 on end + device ref emmc on end + device ref pcie_rp2 on end + device ref pcie_rp5 on end + device ref uart0 on end + device ref gspi1 on chip drivers/spi/acpi register "hid" = "ACPI_DT_NAMESPACE_HID" register "compat_string" = ""google,cr50"" register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_H13_IRQ)" device spi 0 on end end - end # GSPI #1 - device pci 1f.0 on end # eSPI Interface - device pci 1f.1 on end # P2SB - device pci 1f.2 hidden end # Power Management Controller - device pci 1f.3 on end # Intel HDA - device pci 1f.4 on end # SMBus - device pci 1f.5 on end # PCH SPI - device pci 1f.6 off end # GbE + end + device ref hda on end + device ref smbus on end end end