erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mb/google/reef: Use aliases in devicetrees

Browse source 
Convert all PCI device and USB port references in the reef devicetrees
to use aliases from the Apollolake 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.

TEST=Build all reef variants

Change-Id: I08f96d2367fa8fc1ac7eb785c0d5cc08e293921b
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/90927
Reviewed-by: Sean Rhodes <sean@starlabs.systems>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Matt DeVillier 2026-01-26 12:10:10 -06:00 • committed by Sean Rhodes
commit bbc3042bbf
5 changed files with 155 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

78
src/mainboard/google/reef/variants/baseboard/devicetree.cb
View file

@ -118,18 +118,14 @@ chip soc/intel/apollolake
register "slp_s3_assertion_width_usecs" = "28000"
device domain 0 on
device pci 00.0 on end # - Host Bridge
device pci 00.1 on end # - DPTF
device pci 00.2 off end # - NPK
device pci 02.0 on # - Gen
device ref igd on
register "gfx" = "GMA_DEFAULT_PANEL(0)"
end
device pci 03.0 off end # - Iunit
device pci 0d.0 on end # - P2SB
device pci 0d.1 on end # - PMC
device pci 0d.2 on end # - SPI
device pci 0d.3 on end # - Shared SRAM
device pci 0e.0 on # - Audio
device ref p2sb on end
device ref pmc on end
device ref fast_spi on end
device ref sram on end
device ref hda on
chip drivers/generic/max98357a
register "hid" = ""MX98357A""
register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_76)"
@ -137,23 +133,17 @@ chip soc/intel/apollolake
device generic 0 on end
end
end
device pci 0f.0 on end # - CSE
device pci 11.0 off end # - ISH
device pci 12.0 off end # - SATA
device pci 13.0 off end # - Root Port 2 - PCIe-A 0
device pci 13.1 off end # - Root Port 3 - PCIe-A 1
device pci 13.2 off end # - Root Port 4 - PCIe-A 2
device pci 13.3 off end # - Root Port 5 - PCIe-A 3
device pci 14.0 on
device ref heci1 on end
device ref heci2 on end
device ref heci3 on end
device ref pcie_rp05 on
chip drivers/wifi/generic
register "wake" = "GPE0_DW3_00"
device pci 00.0 on end
end
end # - Root Port 0 - PCIe-B 0 - Wifi
device pci 14.1 off end # - Root Port 1 - PCIe-B 1
device pci 15.0 on end # - XHCI
device pci 15.1 off end # - XDCI
device pci 16.0 on # - I2C 0
end
device ref xhci on end
device ref i2c0 on
chip drivers/i2c/da7219
register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_116_IRQ)"
register "btn_cfg" = "50"
@ -172,15 +162,15 @@ chip soc/intel/apollolake
device i2c 1a on end
end
end
device pci 16.1 on end # - I2C 1
device pci 16.2 on
device ref i2c1 on end
device ref i2c2 on
chip drivers/i2c/tpm
register "hid" = ""GOOG0005""
register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_28_IRQ)"
device i2c 50 on end
end
end # - I2C 2
device pci 16.3 on
end
device ref i2c3 on
chip drivers/i2c/generic
register "hid" = ""ELAN0001""
register "desc" = ""ELAN Touchscreen""
@ -193,8 +183,8 @@ chip soc/intel/apollolake
register "has_power_resource" = "true"
device i2c 10 on end
end
end # - I2C 3
device pci 17.0 on
end
device ref i2c4 on
chip drivers/i2c/generic
register "hid" = ""ELAN0000""
register "desc" = ""ELAN Touchpad""
@ -203,8 +193,8 @@ chip soc/intel/apollolake
register "detect" = "1"
device i2c 15 on end
end
end # - I2C 4
device pci 17.1 on
end
device ref i2c5 on
chip drivers/i2c/hid
register "generic.hid" = ""WCOM50C1""
register "generic.desc" = ""WCOM Digitizer""
@ -212,25 +202,19 @@ chip soc/intel/apollolake
register "hid_desc_reg_offset" = "0x1"
device i2c 0x9 on end
end
end # - I2C 5
device pci 17.2 off end # - I2C 6
device pci 17.3 off end # - I2C 7
device pci 18.0 on end # - UART 0
device pci 18.1 on end # - UART 1
device pci 18.2 on end # - UART 2
device pci 18.3 off end # - UART 3
device pci 19.0 on end # - SPI 0
device pci 19.1 off end # - SPI 1
device pci 19.2 off end # - SPI 2
device pci 1a.0 on end # - PWM
device pci 1b.0 on end # - SDCARD
device pci 1c.0 on end # - eMMC
device pci 1e.0 off end # - SDIO
device pci 1f.0 on # - LPC
end
device ref uart0 on end
device ref uart1 on end
device ref uart2 on end
device ref spi0 on end
device ref pwm on end
device ref sdcard on end
device ref emmc on end
device ref lpc_espi on
chip ec/google/chromeec
device pnp 0c09.0 on end
end
end
device pci 1f.1 on end # - SMBUS
device ref smbus on end
end
end

78
src/mainboard/google/reef/variants/coral/devicetree.cb
View file

@ -118,18 +118,14 @@ chip soc/intel/apollolake
register "slp_s3_assertion_width_usecs" = "28000"
device domain 0 on
device pci 00.0 on end # - Host Bridge
device pci 00.1 on end # - DPTF
device pci 00.2 off end # - NPK
device pci 02.0 on # - Gen
device ref igd on
register "gfx" = "GMA_DEFAULT_PANEL(0)"
end
device pci 03.0 off end # - Iunit
device pci 0d.0 on end # - P2SB
device pci 0d.1 on end # - PMC
device pci 0d.2 on end # - SPI
device pci 0d.3 on end # - Shared SRAM
device pci 0e.0 on # - Audio
device ref p2sb on end
device ref pmc on end
device ref fast_spi on end
device ref sram on end
device ref hda on
chip drivers/generic/max98357a
register "hid" = ""MX98357A""
register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_76)"
@ -137,23 +133,17 @@ chip soc/intel/apollolake
device generic 0 on end
end
end
device pci 0f.0 on end # - CSE
device pci 11.0 off end # - ISH
device pci 12.0 off end # - SATA
device pci 13.0 off end # - Root Port 2 - PCIe-A 0
device pci 13.1 off end # - Root Port 3 - PCIe-A 1
device pci 13.2 off end # - Root Port 4 - PCIe-A 2
device pci 13.3 off end # - Root Port 5 - PCIe-A 3
device pci 14.0 on
device ref heci1 on end
device ref heci2 on end
device ref heci3 on end
device ref pcie_rp05 on
chip drivers/wifi/generic
register "wake" = "GPE0_DW3_00"
device pci 00.0 on end
end
end # - Root Port 0 - PCIe-B 0 - Wifi
device pci 14.1 off end # - Root Port 1 - PCIe-B 1
device pci 15.0 on end # - XHCI
device pci 15.1 off end # - XDCI
device pci 16.0 on # - I2C 0
end
device ref xhci on end
device ref i2c0 on
chip drivers/i2c/da7219
register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_116_IRQ)"
register "btn_cfg" = "50"
@ -172,15 +162,15 @@ chip soc/intel/apollolake
device i2c 1a on end
end
end
device pci 16.1 on end # - I2C 1
device pci 16.2 on
device ref i2c1 on end
device ref i2c2 on
chip drivers/i2c/tpm
register "hid" = ""GOOG0005""
register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_28_IRQ)"
device i2c 50 on end
end
end # - I2C 2
device pci 16.3 on
end
device ref i2c3 on
chip drivers/i2c/generic
register "hid" = ""ELAN0001""
register "desc" = ""ELAN Touchscreen""
@ -205,8 +195,8 @@ chip soc/intel/apollolake
register "has_power_resource" = "true"
device i2c 39 on end
end
end # - I2C 3
device pci 17.0 on
end
device ref i2c4 on
chip drivers/i2c/generic
register "hid" = ""ELAN0000""
register "desc" = ""ELAN Touchpad""
@ -225,8 +215,8 @@ chip soc/intel/apollolake
register "hid_desc_reg_offset" = "0x20"
device i2c 0x2c on end
end
end # - I2C 4
device pci 17.1 on
end
device ref i2c5 on
chip drivers/i2c/hid
register "generic.hid" = ""WCOM50C1""
register "generic.desc" = ""WCOM Digitizer""
@ -234,25 +224,19 @@ chip soc/intel/apollolake
register "hid_desc_reg_offset" = "0x1"
device i2c 0x9 on end
end
end # - I2C 5
device pci 17.2 off end # - I2C 6
device pci 17.3 off end # - I2C 7
device pci 18.0 on end # - UART 0
device pci 18.1 off end # - UART 1
device pci 18.2 off end # - UART 2
device pci 18.3 off end # - UART 3
device pci 19.0 on end # - SPI 0
device pci 19.1 off end # - SPI 1
device pci 19.2 off end # - SPI 2
device pci 1a.0 on end # - PWM
device pci 1b.0 on end # - SDCARD
device pci 1c.0 on end # - eMMC
device pci 1e.0 off end # - SDIO
device pci 1f.0 on # - LPC
end
device ref uart0 on end
device ref uart1 off end
device ref uart2 off end
device ref spi0 on end
device ref pwm on end
device ref sdcard on end
device ref emmc on end
device ref lpc_espi on
chip ec/google/chromeec
device pnp 0c09.0 on end
end
end
device pci 1f.1 on end # - SMBUS
device ref smbus on end
end
end

77
src/mainboard/google/reef/variants/pyro/devicetree.cb
View file

@ -127,18 +127,14 @@ chip soc/intel/apollolake
}"
device domain 0 on
device pci 00.0 on end # - Host Bridge
device pci 00.1 on end # - DPTF
device pci 00.2 off end # - NPK
device pci 02.0 on # - Gen
device ref igd on
register "gfx" = "GMA_DEFAULT_PANEL(0)"
end
device pci 03.0 off end # - Iunit
device pci 0d.0 on end # - P2SB
device pci 0d.1 on end # - PMC
device pci 0d.2 on end # - SPI
device pci 0d.3 on end # - Shared SRAM
device pci 0e.0 on # - Audio
device ref p2sb on end
device ref pmc on end
device ref fast_spi on end
device ref sram on end
device ref hda on
chip drivers/generic/max98357a
register "hid" = ""MX98357A""
register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_76)"
@ -146,23 +142,17 @@ chip soc/intel/apollolake
device generic 0 on end
end
end
device pci 0f.0 on end # - CSE
device pci 11.0 off end # - ISH
device pci 12.0 off end # - SATA
device pci 13.0 off end # - Root Port 2 - PCIe-A 0
device pci 13.1 off end # - Root Port 3 - PCIe-A 1
device pci 13.2 off end # - Root Port 4 - PCIe-A 2
device pci 13.3 off end # - Root Port 5 - PCIe-A 3
device pci 14.0 on
device ref heci1 on end
device ref heci2 on end
device ref heci3 on end
device ref pcie_rp05 on
chip drivers/wifi/generic
register "wake" = "GPE0_DW3_00"
device pci 00.0 on end
end
end # - Root Port 0 - PCIe-B 0 - Wifi
device pci 14.1 off end # - Root Port 1 - PCIe-B 1
device pci 15.0 on end # - XHCI
device pci 15.1 off end # - XDCI
device pci 16.0 on # - I2C 0
end
device ref xhci on end
device ref i2c0 on
chip drivers/i2c/da7219
register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_116_IRQ)"
register "btn_cfg" = "50"
@ -181,15 +171,15 @@ chip soc/intel/apollolake
device i2c 1a on end
end
end
device pci 16.1 on end # - I2C 1
device pci 16.2 on
device ref i2c1 on end
device ref i2c2 on
chip drivers/i2c/tpm
register "hid" = ""GOOG0005""
register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_28_IRQ)"
device i2c 50 on end
end
end # - I2C 2
device pci 16.3 on
end
device ref i2c3 on
chip drivers/i2c/hid
register "generic.hid" = ""WCOMNTN2""
register "generic.desc" = ""WCOM Touchscreen""
@ -215,8 +205,8 @@ chip soc/intel/apollolake
register "has_power_resource" = "true"
device i2c 10 on end
end
end # - I2C 3
device pci 17.0 on
end
device ref i2c4 on
chip drivers/i2c/generic
register "hid" = ""ELAN0000""
register "desc" = ""ELAN Touchpad""
@ -225,26 +215,21 @@ chip soc/intel/apollolake
register "detect" = "1"
device i2c 15 on end
end
end # - I2C 4
device pci 17.1 off end # - I2C 5
device pci 17.2 off end # - I2C 6
device pci 17.3 off end # - I2C 7
device pci 18.0 on end # - UART 0
device pci 18.1 on end # - UART 1
device pci 18.2 on end # - UART 2
device pci 18.3 off end # - UART 3
device pci 19.0 on end # - SPI 0
device pci 19.1 off end # - SPI 1
device pci 19.2 off end # - SPI 2
device pci 1a.0 on end # - PWM
device pci 1b.0 on end # - SDCARD
device pci 1c.0 on end # - eMMC
device pci 1e.0 off end # - SDIO
device pci 1f.0 on # - LPC
end
device ref i2c5 off end
device ref i2c6 off end
device ref uart0 on end
device ref uart1 on end
device ref uart2 on end
device ref spi0 on end
device ref pwm on end
device ref sdcard on end
device ref emmc on end
device ref lpc_espi on
chip ec/google/chromeec
device pnp 0c09.0 on end
end
end
device pci 1f.1 on end # - SMBUS
device ref smbus on end
end
end

78
src/mainboard/google/reef/variants/sand/devicetree.cb
View file

@ -114,18 +114,14 @@ chip soc/intel/apollolake
register "slp_s3_assertion_width_usecs" = "28000"
device domain 0 on
device pci 00.0 on end # - Host Bridge
device pci 00.1 on end # - DPTF
device pci 00.2 off end # - NPK
device pci 02.0 on # - Gen
device ref igd on
register "gfx" = "GMA_DEFAULT_PANEL(0)"
end
device pci 03.0 off end # - Iunit
device pci 0d.0 on end # - P2SB
device pci 0d.1 on end # - PMC
device pci 0d.2 on end # - SPI
device pci 0d.3 on end # - Shared SRAM
device pci 0e.0 on # - Audio
device ref p2sb on end
device ref pmc on end
device ref fast_spi on end
device ref sram on end
device ref hda on
chip drivers/generic/max98357a
register "hid" = ""MX98357A""
register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_76)"
@ -133,23 +129,17 @@ chip soc/intel/apollolake
device generic 0 on end
end
end
device pci 0f.0 on end # - CSE
device pci 11.0 off end # - ISH
device pci 12.0 off end # - SATA
device pci 13.0 off end # - Root Port 2 - PCIe-A 0
device pci 13.1 off end # - Root Port 3 - PCIe-A 1
device pci 13.2 off end # - Root Port 4 - PCIe-A 2
device pci 13.3 off end # - Root Port 5 - PCIe-A 3
device pci 14.0 on
device ref heci1 on end
device ref heci2 on end
device ref heci3 on end
device ref pcie_rp05 on
chip drivers/wifi/generic
register "wake" = "GPE0_DW3_00"
device pci 00.0 on end
end
end # - Root Port 0 - PCIe-B 0 - Wifi
device pci 14.1 off end # - Root Port 1 - PCIe-B 1
device pci 15.0 on end # - XHCI
device pci 15.1 off end # - XDCI
device pci 16.0 on # - I2C 0
end
device ref xhci on end
device ref i2c0 on
chip drivers/i2c/da7219
register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_116_IRQ)"
register "btn_cfg" = "50"
@ -168,15 +158,15 @@ chip soc/intel/apollolake
device i2c 1a on end
end
end
device pci 16.1 on end # - I2C 1
device pci 16.2 on
device ref i2c1 on end
device ref i2c2 on
chip drivers/i2c/tpm
register "hid" = ""GOOG0005""
register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_28_IRQ)"
device i2c 50 on end
end
end # - I2C 2
device pci 16.3 on
end
device ref i2c3 on
chip drivers/i2c/generic
register "hid" = ""RAYD0001""
register "desc" = ""Raydium Touchscreen""
@ -189,8 +179,8 @@ chip soc/intel/apollolake
register "has_power_resource" = "true"
device i2c 39 on end
end
end # - I2C 3
device pci 17.0 on
end
device ref i2c4 on
chip drivers/i2c/generic
register "hid" = ""ELAN0000""
register "desc" = ""ELAN Touchpad""
@ -199,8 +189,8 @@ chip soc/intel/apollolake
register "detect" = "1"
device i2c 15 on end
end
end # - I2C 4
device pci 17.1 on
end
device ref i2c5 on
chip drivers/i2c/hid
register "generic.hid" = ""WCOM50C1""
register "generic.desc" = ""WCOM Digitizer""
@ -208,25 +198,19 @@ chip soc/intel/apollolake
register "hid_desc_reg_offset" = "0x1"
device i2c 0x9 on end
end
end # - I2C 5
device pci 17.2 off end # - I2C 6
device pci 17.3 off end # - I2C 7
device pci 18.0 on end # - UART 0
device pci 18.1 on end # - UART 1
device pci 18.2 on end # - UART 2
device pci 18.3 off end # - UART 3
device pci 19.0 on end # - SPI 0
device pci 19.1 off end # - SPI 1
device pci 19.2 off end # - SPI 2
device pci 1a.0 on end # - PWM
device pci 1b.0 on end # - SDCARD
device pci 1c.0 on end # - eMMC
device pci 1e.0 off end # - SDIO
device pci 1f.0 on # - LPC
end
device ref uart0 on end
device ref uart1 on end
device ref uart2 on end
device ref spi0 on end
device ref pwm on end
device ref sdcard on end
device ref emmc on end
device ref lpc_espi on
chip ec/google/chromeec
device pnp 0c09.0 on end
end
end
device pci 1f.1 on end # - SMBUS
device ref smbus on end
end
end

78
src/mainboard/google/reef/variants/snappy/devicetree.cb
View file

@ -123,18 +123,14 @@ chip soc/intel/apollolake
}"
device domain 0 on
device pci 00.0 on end # - Host Bridge
device pci 00.1 on end # - DPTF
device pci 00.2 off end # - NPK
device pci 02.0 on # - Gen
device ref igd on
register "gfx" = "GMA_DEFAULT_PANEL(0)"
end
device pci 03.0 off end # - Iunit
device pci 0d.0 on end # - P2SB
device pci 0d.1 on end # - PMC
device pci 0d.2 on end # - SPI
device pci 0d.3 on end # - Shared SRAM
device pci 0e.0 on # - Audio
device ref p2sb on end
device ref pmc on end
device ref fast_spi on end
device ref sram on end
device ref hda on
chip drivers/generic/max98357a
register "hid" = ""MX98357A""
register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_76)"
@ -142,23 +138,17 @@ chip soc/intel/apollolake
device generic 0 on end
end
end
device pci 0f.0 on end # - CSE
device pci 11.0 off end # - ISH
device pci 12.0 off end # - SATA
device pci 13.0 off end # - Root Port 2 - PCIe-A 0
device pci 13.1 off end # - Root Port 3 - PCIe-A 1
device pci 13.2 off end # - Root Port 4 - PCIe-A 2
device pci 13.3 off end # - Root Port 5 - PCIe-A 3
device pci 14.0 on
device ref heci1 on end
device ref heci2 on end
device ref heci3 on end
device ref pcie_rp05 on
chip drivers/wifi/generic
register "wake" = "GPE0_DW3_00"
device pci 00.0 on end
end
end # - Root Port 0 - PCIe-B 0 - Wifi
device pci 14.1 off end # - Root Port 1 - PCIe-B 1
device pci 15.0 on end # - XHCI
device pci 15.1 off end # - XDCI
device pci 16.0 on # - I2C 0
end
device ref xhci on end
device ref i2c0 on
chip drivers/i2c/da7219
register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_116_IRQ)"
register "btn_cfg" = "50"
@ -177,15 +167,15 @@ chip soc/intel/apollolake
device i2c 1a on end
end
end
device pci 16.1 on end # - I2C 1
device pci 16.2 on
device ref i2c1 on end
device ref i2c2 on
chip drivers/i2c/tpm
register "hid" = ""GOOG0005""
register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_28_IRQ)"
device i2c 50 on end
end
end # - I2C 2
device pci 16.3 on
end
device ref i2c3 on
chip drivers/i2c/generic
register "hid" = ""ELAN0001""
register "desc" = ""ELAN Touchscreen""
@ -257,8 +247,8 @@ chip soc/intel/apollolake
register "hid_desc_reg_offset" = "0x01"
device i2c 40 on end
end
end # - I2C 3
device pci 17.0 on
end
device ref i2c4 on
chip drivers/i2c/generic
register "hid" = ""ELAN0000""
register "desc" = ""ELAN Touchpad""
@ -267,8 +257,8 @@ chip soc/intel/apollolake
register "detect" = "1"
device i2c 15 on end
end
end # - I2C 4
device pci 17.1 on
end
device ref i2c5 on
chip drivers/i2c/hid
register "generic.hid" = ""WCOM50C1""
register "generic.desc" = ""WCOM Digitizer""
@ -276,25 +266,19 @@ chip soc/intel/apollolake
register "hid_desc_reg_offset" = "0x1"
device i2c 0x9 on end
end
end # - I2C 5
device pci 17.2 off end # - I2C 6
device pci 17.3 off end # - I2C 7
device pci 18.0 on end # - UART 0
device pci 18.1 on end # - UART 1
device pci 18.2 on end # - UART 2
device pci 18.3 off end # - UART 3
device pci 19.0 on end # - SPI 0
device pci 19.1 off end # - SPI 1
device pci 19.2 off end # - SPI 2
device pci 1a.0 on end # - PWM
device pci 1b.0 on end # - SDCARD
device pci 1c.0 on end # - eMMC
device pci 1e.0 off end # - SDIO
device pci 1f.0 on # - LPC
end
device ref uart0 on end
device ref uart1 on end
device ref uart2 on end
device ref spi0 on end
device ref pwm on end
device ref sdcard on end
device ref emmc on end
device ref lpc_espi on
chip ec/google/chromeec
device pnp 0c09.0 on end
end
end
device pci 1f.1 on end # - SMBUS
device ref smbus on end
end
end