Skip to content

Commit

Permalink
Merge pull request #178 from coreboot/main
Browse files Browse the repository at this point in the history
[pull] main from coreboot:main
  • Loading branch information
pull[bot] authored Jul 15, 2024
2 parents e79cd6e + b0fa668 commit b926571
Show file tree
Hide file tree
Showing 13 changed files with 899 additions and 180 deletions.
27 changes: 0 additions & 27 deletions src/mainboard/google/poppy/variants/atlas/devicetree.cb
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,9 @@ chip soc/intel/skylake
}"

device domain 0 on
device ref system_agent on end
device ref igpu on end
device ref sa_thermal on end
device ref imgu on end
device ref ish off end
device ref south_xhci on
register "usb2_ports" = "{
[0] = USB2_PORT_LONG(OC0), // Type-C Port 1
Expand Down Expand Up @@ -262,7 +260,6 @@ chip soc/intel/skylake
device i2c 0x49 on end
end
end
device ref i2c1 off end
device ref i2c2 on
chip drivers/i2c/hid
register "generic.hid" = ""ACPI0C50""
Expand All @@ -275,13 +272,7 @@ chip soc/intel/skylake
end
device ref i2c3 on end # Camera
device ref heci1 on end
device ref heci2 off end
device ref csme_ider off end
device ref csme_ktr off end
device ref heci3 off end
device ref sata off end
device ref uart2 on end
device ref i2c5 off end
device ref i2c4 on
chip drivers/i2c/max98373
register "vmon_slot_no" = "4"
Expand Down Expand Up @@ -330,19 +321,7 @@ chip soc/intel/skylake
device pci 00.0 on end
end
end
device ref pcie_rp2 off end
device ref pcie_rp3 off end
device ref pcie_rp4 off end
device ref pcie_rp5 off end
device ref pcie_rp6 off end
device ref pcie_rp7 off end
device ref pcie_rp8 off end
device ref pcie_rp9 off end
device ref pcie_rp10 off end
device ref pcie_rp11 off end
device ref pcie_rp12 off end
device ref uart0 on end
device ref uart1 off end
device ref gspi0 on
chip drivers/spi/acpi
register "hid" = "ACPI_DT_NAMESPACE_HID"
Expand All @@ -351,10 +330,7 @@ chip soc/intel/skylake
device spi 0 on end
end
end
device ref gspi1 off end
device ref emmc on end
device ref sdio off end
device ref sdxc off end
device ref lpc_espi on
# EC host command ranges are in 0x800-0x8ff & 0x200-0x20f
register "gen1_dec" = "0x00fc0801"
Expand All @@ -366,11 +342,8 @@ chip soc/intel/skylake
device pnp 0c09.0 on end
end
end
device ref p2sb on end
device ref pmc on end
device ref hda on end
device ref smbus on end
device ref fast_spi on end
device ref gbe off end
end
end
24 changes: 0 additions & 24 deletions src/mainboard/google/poppy/variants/baseboard/devicetree.cb
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@ chip soc/intel/skylake
register "sdcard_cd_gpio" = "GPP_E15"

device domain 0 on
device ref system_agent on end
device ref igpu on end
device ref sa_thermal on end
device ref imgu on end
Expand Down Expand Up @@ -293,11 +292,6 @@ chip soc/intel/skylake
end
end
device ref heci1 on end
device ref heci2 off end
device ref csme_ider off end
device ref csme_ktr off end
device ref heci3 off end
device ref sata off end
device ref uart2 on end
device ref i2c5 on
chip drivers/i2c/max98927
Expand Down Expand Up @@ -340,23 +334,8 @@ chip soc/intel/skylake
device pci 00.0 on end
end
end
device ref pcie_rp2 off end
device ref pcie_rp3 off end
device ref pcie_rp4 off end
device ref pcie_rp5 off end
device ref pcie_rp6 off end
device ref pcie_rp7 off end
device ref pcie_rp8 off end
device ref pcie_rp9 off end
device ref pcie_rp10 off end
device ref pcie_rp11 off end
device ref pcie_rp12 off end
device ref uart0 on end
device ref uart1 off end
device ref gspi0 off end
device ref gspi1 off end
device ref emmc on end
device ref sdio off end
device ref sdxc on end
device ref lpc_espi on
# EC host command ranges are in 0x800-0x8ff & 0x200-0x20f
Expand All @@ -369,11 +348,8 @@ chip soc/intel/skylake
device pnp 0c09.0 on end
end
end
device ref p2sb on end
device ref pmc on end
device ref hda on end
device ref smbus on end
device ref fast_spi on end
device ref gbe off end
end
end
24 changes: 0 additions & 24 deletions src/mainboard/google/poppy/variants/nami/devicetree.cb
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,8 @@ chip soc/intel/skylake
}"

device domain 0 on
device ref system_agent on end
device ref igpu on end
device ref sa_thermal on end
device ref imgu off end
device ref south_xhci on
register "usb2_ports" = "{
[0] = USB2_PORT_LONG(OC0), // Type-C Port 0
Expand All @@ -235,7 +233,6 @@ chip soc/intel/skylake
end
device ref south_xdci on end
device ref thermal on end
device ref cio off end
device ref i2c0 on
chip drivers/i2c/generic
register "hid" = ""ELAN0001""
Expand Down Expand Up @@ -365,17 +362,8 @@ chip soc/intel/skylake
end
end
device ref heci1 on end
device ref heci2 off end
device ref csme_ider off end
device ref csme_ktr off end
device ref heci3 off end
device ref sata off end
device ref uart2 on end
device ref i2c5 off end
device ref i2c4 off end
device ref pcie_rp1 on end
device ref pcie_rp2 off end
device ref pcie_rp3 off end
device ref pcie_rp4 on
# x1
register "PcieRpEnable[3]" = "1"
Expand All @@ -398,9 +386,6 @@ chip soc/intel/skylake
register "PcieRpAdvancedErrorReporting[4]" = "1"
register "PcieRpLtrEnable[4]" = "1"
end
device ref pcie_rp6 off end
device ref pcie_rp7 off end
device ref pcie_rp8 off end
device ref pcie_rp9 on
# x2
register "PcieRpEnable[8]" = "1"
Expand All @@ -410,11 +395,7 @@ chip soc/intel/skylake
register "PcieRpAdvancedErrorReporting[8]" = "1"
register "PcieRpLtrEnable[8]" = "1"
end
device ref pcie_rp10 off end
device ref pcie_rp11 off end
device ref pcie_rp12 off end
device ref uart0 on end
device ref uart1 off end
device ref gspi0 on
chip drivers/spi/acpi
register "hid" = "ACPI_DT_NAMESPACE_HID"
Expand All @@ -435,8 +416,6 @@ chip soc/intel/skylake
end # FPMCU
end
device ref emmc on end
device ref sdio off end
device ref sdxc off end
device ref lpc_espi on
# EC host command ranges are in 0x800-0x8ff & 0x200-0x20f
register "gen1_dec" = "0x00fc0801"
Expand All @@ -448,11 +427,8 @@ chip soc/intel/skylake
device pnp 0c09.0 on end
end
end
device ref p2sb on end
device ref pmc on end
device ref hda on end
device ref smbus on end
device ref fast_spi on end
device ref gbe off end
end
end
24 changes: 0 additions & 24 deletions src/mainboard/google/poppy/variants/nautilus/devicetree.cb
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@ chip soc/intel/skylake
register "sdcard_cd_gpio" = "GPP_E15"

device domain 0 on
device ref system_agent on end
device ref igpu on end
device ref sa_thermal on end
device ref imgu on end
Expand Down Expand Up @@ -326,11 +325,6 @@ chip soc/intel/skylake
end
end
device ref heci1 on end
device ref heci2 off end
device ref csme_ider off end
device ref csme_ktr off end
device ref heci3 off end
device ref sata off end
device ref uart2 on end
device ref i2c5 on
chip drivers/generic/max98357a
Expand Down Expand Up @@ -378,23 +372,8 @@ chip soc/intel/skylake
device pci 00.0 on end
end
end
device ref pcie_rp2 off end
device ref pcie_rp3 off end
device ref pcie_rp4 off end
device ref pcie_rp5 off end
device ref pcie_rp6 off end
device ref pcie_rp7 off end
device ref pcie_rp8 off end
device ref pcie_rp9 off end
device ref pcie_rp10 off end
device ref pcie_rp11 off end
device ref pcie_rp12 off end
device ref uart0 on end
device ref uart1 off end
device ref gspi0 off end
device ref gspi1 off end
device ref emmc on end
device ref sdio off end
device ref sdxc on end
device ref lpc_espi on
# EC host command ranges are in 0x800-0x8ff & 0x200-0x20f
Expand All @@ -407,11 +386,8 @@ chip soc/intel/skylake
device pnp 0c09.0 on end
end
end
device ref p2sb on end
device ref pmc on end
device ref hda on end
device ref smbus on end
device ref fast_spi on end
device ref gbe off end
end
end
24 changes: 0 additions & 24 deletions src/mainboard/google/poppy/variants/nocturne/devicetree.cb
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ chip soc/intel/skylake
}"

device domain 0 on
device ref system_agent on end
device ref igpu on end
device ref sa_thermal on end
device ref imgu on end
Expand Down Expand Up @@ -286,14 +285,8 @@ chip soc/intel/skylake
register "proxraw_strength" = "0"
end
end
device ref i2c2 off end
device ref i2c3 on end
device ref heci1 on end
device ref heci2 off end
device ref csme_ider off end
device ref csme_ktr off end
device ref heci3 off end
device ref sata off end
device ref uart2 on end
device ref i2c5 on
chip drivers/i2c/sx9310
Expand Down Expand Up @@ -343,13 +336,6 @@ chip soc/intel/skylake
device pci 00.0 on end
end
end
device ref pcie_rp2 off end
device ref pcie_rp3 off end
device ref pcie_rp4 off end
device ref pcie_rp5 off end
device ref pcie_rp6 off end
device ref pcie_rp7 off end
device ref pcie_rp8 off end
device ref pcie_rp9 on
# x2
register "PcieRpEnable[8]" = "1"
Expand All @@ -359,11 +345,6 @@ chip soc/intel/skylake
register "PcieRpAdvancedErrorReporting[8]" = "1"
register "PcieRpLtrEnable[8]" = "1"
end
device ref pcie_rp10 off end
device ref pcie_rp11 off end
device ref pcie_rp12 off end
device ref uart0 off end
device ref uart1 off end
device ref gspi0 on
chip drivers/spi/acpi
register "hid" = "ACPI_DT_NAMESPACE_HID"
Expand All @@ -384,8 +365,6 @@ chip soc/intel/skylake
end # FPMCU
end
device ref emmc on end
device ref sdio off end
device ref sdxc off end
device ref lpc_espi on
# EC host command ranges are in 0x800-0x8ff & 0x200-0x20f
register "gen1_dec" = "0x00fc0801"
Expand All @@ -397,11 +376,8 @@ chip soc/intel/skylake
device pnp 0c09.0 on end
end
end
device ref p2sb on end
device ref pmc on end
device ref hda on end
device ref smbus on end
device ref fast_spi on end
device ref gbe off end
end
end
Loading

0 comments on commit b926571

Please sign in to comment.