mb, soc/intel: Reorganize CNVi device entries in devicetree
This change reorganizes the CNVi device entries in mainboard devicetree/overridetree and SoC chipset tree to make it consistent with how other SoC internal PCI devices are represented i.e. without a chip driver around the SoC controller itself. Before: chip drivers/wifi/generic register "wake" = "..." device pci xx.y on end end After: device pci xx.y on chip drivers/wifi/generic register "wake" = "..." device generic 0 on end end end Change-Id: I22660047a3afd5994400341de0ca461bbc0634e2 Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/46865 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
This commit is contained in:
committed by
Patrick Georgi
parent
23e88135bb
commit
edac4ef6d4
@@ -216,10 +216,12 @@ chip soc/intel/alderlake
|
||||
end # USB3.1 xHCI
|
||||
device pci 14.1 off end # USB3.1 xDCI
|
||||
device pci 14.2 off end # Shared RAM
|
||||
chip drivers/wifi/generic
|
||||
register "wake" = "GPE0_PME_B0"
|
||||
device pci 14.3 on end # CNVi: WiFi
|
||||
end
|
||||
device pci 14.3 on
|
||||
chip drivers/wifi/generic
|
||||
register "wake" = "GPE0_PME_B0"
|
||||
device generic 0 on end
|
||||
end
|
||||
end # CNVi: WiFi
|
||||
device pci 15.0 on end # I2C0
|
||||
device pci 15.1 on end # I2C1
|
||||
device pci 15.2 on end # I2C2
|
||||
|
@@ -91,10 +91,12 @@ chip soc/intel/cannonlake
|
||||
device pci 12.6 off end # GSPI #2
|
||||
device pci 14.0 on end # USB xHCI
|
||||
device pci 14.1 off end # USB xDCI (OTG)
|
||||
chip drivers/wifi/generic
|
||||
register "wake" = "PME_B0_EN_BIT"
|
||||
device pci 14.3 on end # CNVi wifi
|
||||
end
|
||||
device pci 14.3 on
|
||||
chip drivers/wifi/generic
|
||||
register "wake" = "PME_B0_EN_BIT"
|
||||
device generic 0 on end
|
||||
end
|
||||
end # CNVi wifi
|
||||
device pci 14.5 on end # SDCard
|
||||
device pci 15.0 on end # I2C #0
|
||||
device pci 15.1 on end # I2C #1
|
||||
|
@@ -72,10 +72,12 @@ chip soc/intel/cannonlake
|
||||
device pci 12.6 off end # GSPI #2
|
||||
device pci 14.0 on end # USB xHCI
|
||||
device pci 14.1 off end # USB xDCI (OTG)
|
||||
chip drivers/wifi/generic
|
||||
register "wake" = "PME_B0_EN_BIT"
|
||||
device pci 14.3 on end # CNVi wifi
|
||||
end
|
||||
device pci 14.3 on
|
||||
chip drivers/wifi/generic
|
||||
register "wake" = "PME_B0_EN_BIT"
|
||||
device generic 0 on end
|
||||
end
|
||||
end # CNVi wifi
|
||||
device pci 14.5 on end # SDCard
|
||||
device pci 15.0 on
|
||||
chip drivers/i2c/hid
|
||||
|
@@ -92,10 +92,12 @@ chip soc/intel/cannonlake
|
||||
register "PcieClkSrcClkReq[10]" = "10"
|
||||
|
||||
device domain 0 on
|
||||
chip drivers/wifi/generic
|
||||
register "wake" = "PME_B0_EN_BIT"
|
||||
device pci 14.3 on end # CNVi wifi
|
||||
end
|
||||
device pci 14.3 on
|
||||
chip drivers/wifi/generic
|
||||
register "wake" = "PME_B0_EN_BIT"
|
||||
device generic 0 on end
|
||||
end
|
||||
end # CNVi wifi
|
||||
device pci 15.0 on end # I2C #0
|
||||
device pci 15.1 on end # I2C #1
|
||||
device pci 15.2 on end # I2C #2
|
||||
|
@@ -61,10 +61,12 @@ chip soc/intel/cannonlake
|
||||
}"
|
||||
|
||||
device domain 0 on
|
||||
chip drivers/wifi/generic
|
||||
register "wake" = "PME_B0_EN_BIT"
|
||||
device pci 14.3 on end # CNVi wifi
|
||||
end
|
||||
device pci 14.3 on
|
||||
chip drivers/wifi/generic
|
||||
register "wake" = "PME_B0_EN_BIT"
|
||||
device generic 0 on end
|
||||
end
|
||||
end # CNVi wifi
|
||||
device pci 15.0 on end # I2C #0
|
||||
device pci 15.1 on end # I2C #1
|
||||
device pci 15.2 off end # I2C #2
|
||||
|
@@ -80,10 +80,12 @@ chip soc/intel/cannonlake
|
||||
register "sdcard_cd_gpio" = "GPP_G5"
|
||||
|
||||
device domain 0 on
|
||||
chip drivers/wifi/generic
|
||||
register "wake" = "PME_B0_EN_BIT"
|
||||
device pci 14.3 on end # CNVi wifi
|
||||
end
|
||||
device pci 14.3 on
|
||||
chip drivers/wifi/generic
|
||||
register "wake" = "PME_B0_EN_BIT"
|
||||
device generic 0 on end
|
||||
end
|
||||
end # CNVi wifi
|
||||
device pci 14.5 on end # SDCard
|
||||
device pci 15.0 on end # I2C #0
|
||||
device pci 15.1 on end # I2C #1
|
||||
|
@@ -65,10 +65,12 @@ chip soc/intel/cannonlake
|
||||
register "sdcard_cd_gpio" = "GPP_G5"
|
||||
|
||||
device domain 0 on
|
||||
chip drivers/wifi/generic
|
||||
register "wake" = "PME_B0_EN_BIT"
|
||||
device pci 14.3 on end # CNVi wifi
|
||||
end
|
||||
device pci 14.3 on
|
||||
chip drivers/wifi/generic
|
||||
register "wake" = "PME_B0_EN_BIT"
|
||||
device generic 0 on end
|
||||
end
|
||||
end # CNVi wifi
|
||||
device pci 15.0 on end # I2C #0
|
||||
device pci 15.1 on end # I2C #1
|
||||
device pci 15.2 off end # I2C #2
|
||||
|
@@ -277,10 +277,12 @@ chip soc/intel/icelake
|
||||
end # USB xHCI
|
||||
device pci 14.1 off end # USB xDCI (OTG)
|
||||
device pci 14.2 off end # PMC SRAM
|
||||
chip drivers/wifi/generic
|
||||
register "wake" = "GPE0_PME_B0"
|
||||
device pci 14.3 on end # CNVi wifi
|
||||
end
|
||||
device pci 14.3 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
|
||||
chip drivers/i2c/hid
|
||||
|
@@ -277,10 +277,12 @@ chip soc/intel/icelake
|
||||
end # USB xHCI
|
||||
device pci 14.1 off end # USB xDCI (OTG)
|
||||
device pci 14.2 off end # PMC SRAM
|
||||
chip drivers/wifi/generic
|
||||
register "wake" = "GPE0_PME_B0"
|
||||
device pci 14.3 on end # CNVi wifi
|
||||
end
|
||||
device pci 14.3 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
|
||||
chip drivers/i2c/hid
|
||||
|
@@ -296,10 +296,12 @@ chip soc/intel/jasperlake
|
||||
end # USB xHCI
|
||||
device pci 14.1 off end # USB xDCI (OTG)
|
||||
device pci 14.2 off end # PMC SRAM
|
||||
chip drivers/wifi/generic
|
||||
register "wake" = "GPE0_PME_B0"
|
||||
device pci 14.3 on end # CNVi wifi
|
||||
end
|
||||
device pci 14.3 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
|
||||
chip drivers/i2c/max98373
|
||||
|
@@ -227,10 +227,12 @@ chip soc/intel/tigerlake
|
||||
device pci 14.0 on end # USB3.1 xHCI 0xA0ED
|
||||
device pci 14.1 on end # USB3.1 xDCI 0xA0EE
|
||||
device pci 14.2 on end # Shared RAM 0xA0EF
|
||||
chip drivers/wifi/generic
|
||||
register "wake" = "GPE0_PME_B0"
|
||||
device pci 14.3 on end # CNVi: WiFi 0xA0F0 - A0F3
|
||||
end
|
||||
device pci 14.3 on
|
||||
chip drivers/wifi/generic
|
||||
register "wake" = "GPE0_PME_B0"
|
||||
device generic 0 on end
|
||||
end
|
||||
end # CNVi: WiFi 0xA0F0 - A0F3
|
||||
|
||||
device pci 15.0 on # I2C0 0xA0E8
|
||||
chip drivers/i2c/generic
|
||||
|
@@ -231,10 +231,12 @@ chip soc/intel/tigerlake
|
||||
device pci 14.0 on end # USB3.1 xHCI 0xA0ED
|
||||
device pci 14.1 on end # USB3.1 xDCI 0xA0EE
|
||||
device pci 14.2 on end # Shared RAM 0xA0EF
|
||||
chip drivers/wifi/generic
|
||||
register "wake" = "GPE0_PME_B0"
|
||||
device pci 14.3 on end # CNVi: WiFi 0xA0F0 - A0F3
|
||||
end
|
||||
device pci 14.3 on
|
||||
chip drivers/wifi/generic
|
||||
register "wake" = "GPE0_PME_B0"
|
||||
device generic 0 on end
|
||||
end
|
||||
end # CNVi: WiFi 0xA0F0 - A0F3
|
||||
|
||||
device pci 15.0 on # I2C0 0xA0E8
|
||||
chip drivers/i2c/generic
|
||||
|
Reference in New Issue
Block a user