Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/83454?usp=email )
Change subject: mb/google/poppy: Drop superfluous devices from devicetree ......................................................................
mb/google/poppy: Drop superfluous devices from devicetree
In order to clean up a bit, drop devices which are equivalent to the ones from chipset devicetree.
Change-Id: Ief199db47fc529c510709ac37be6014b63244e84 Signed-off-by: Felix Singer felixsinger@posteo.net Reviewed-on: https://review.coreboot.org/c/coreboot/+/83454 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Eric Lai ericllai@google.com --- M src/mainboard/google/poppy/variants/atlas/devicetree.cb M src/mainboard/google/poppy/variants/baseboard/devicetree.cb M src/mainboard/google/poppy/variants/nami/devicetree.cb M src/mainboard/google/poppy/variants/nautilus/devicetree.cb M src/mainboard/google/poppy/variants/nocturne/devicetree.cb M src/mainboard/google/poppy/variants/rammus/devicetree.cb M src/mainboard/google/poppy/variants/soraka/devicetree.cb 7 files changed, 0 insertions(+), 177 deletions(-)
Approvals: Eric Lai: Looks good to me, approved build bot (Jenkins): Verified
diff --git a/src/mainboard/google/poppy/variants/atlas/devicetree.cb b/src/mainboard/google/poppy/variants/atlas/devicetree.cb index 48b9a920..04df902 100644 --- a/src/mainboard/google/poppy/variants/atlas/devicetree.cb +++ b/src/mainboard/google/poppy/variants/atlas/devicetree.cb @@ -202,11 +202,9 @@ }"
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 @@ -262,7 +260,6 @@ device i2c 0x49 on end end end - device ref i2c1 off end device ref i2c2 on chip drivers/i2c/hid register "generic.hid" = ""ACPI0C50"" @@ -275,13 +272,7 @@ 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" @@ -330,19 +321,7 @@ 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" @@ -351,10 +330,7 @@ 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" @@ -366,11 +342,8 @@ 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 diff --git a/src/mainboard/google/poppy/variants/baseboard/devicetree.cb b/src/mainboard/google/poppy/variants/baseboard/devicetree.cb index 17eee30..feea932 100644 --- a/src/mainboard/google/poppy/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/poppy/variants/baseboard/devicetree.cb @@ -217,7 +217,6 @@ 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 @@ -293,11 +292,6 @@ 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 @@ -340,23 +334,8 @@ 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 @@ -369,11 +348,8 @@ 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 diff --git a/src/mainboard/google/poppy/variants/nami/devicetree.cb b/src/mainboard/google/poppy/variants/nami/devicetree.cb index b970077..139a3c8 100644 --- a/src/mainboard/google/poppy/variants/nami/devicetree.cb +++ b/src/mainboard/google/poppy/variants/nami/devicetree.cb @@ -211,10 +211,8 @@ }"
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 @@ -235,7 +233,6 @@ 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"" @@ -365,17 +362,8 @@ 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" @@ -398,9 +386,6 @@ 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" @@ -410,11 +395,7 @@ 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" @@ -435,8 +416,6 @@ 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" @@ -448,11 +427,8 @@ 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 diff --git a/src/mainboard/google/poppy/variants/nautilus/devicetree.cb b/src/mainboard/google/poppy/variants/nautilus/devicetree.cb index 92d72f8..363b614 100644 --- a/src/mainboard/google/poppy/variants/nautilus/devicetree.cb +++ b/src/mainboard/google/poppy/variants/nautilus/devicetree.cb @@ -247,7 +247,6 @@ 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 @@ -326,11 +325,6 @@ 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 @@ -378,23 +372,8 @@ 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 @@ -407,11 +386,8 @@ 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 diff --git a/src/mainboard/google/poppy/variants/nocturne/devicetree.cb b/src/mainboard/google/poppy/variants/nocturne/devicetree.cb index 27b2f0b..5f94e93 100644 --- a/src/mainboard/google/poppy/variants/nocturne/devicetree.cb +++ b/src/mainboard/google/poppy/variants/nocturne/devicetree.cb @@ -204,7 +204,6 @@ }"
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 @@ -286,14 +285,8 @@ 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 @@ -343,13 +336,6 @@ 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" @@ -359,11 +345,6 @@ 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" @@ -384,8 +365,6 @@ 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" @@ -397,11 +376,8 @@ 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 diff --git a/src/mainboard/google/poppy/variants/rammus/devicetree.cb b/src/mainboard/google/poppy/variants/rammus/devicetree.cb index 8c8eb7f..3743385 100644 --- a/src/mainboard/google/poppy/variants/rammus/devicetree.cb +++ b/src/mainboard/google/poppy/variants/rammus/devicetree.cb @@ -198,10 +198,8 @@ 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 off end device ref south_xhci on register "usb2_ports" = "{ [0] = USB2_PORT_SHORT(OC0), // Type-C Port 1 @@ -250,9 +248,7 @@ end end end - device ref south_xdci off end device ref thermal on end - device ref cio off end device ref i2c0 on chip drivers/i2c/hid register "generic.hid" = ""PNP0C50"" @@ -278,14 +274,7 @@ device i2c 15 on end end end - device ref i2c2 off end - device ref i2c3 off 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 @@ -324,7 +313,6 @@ device i2c 1A on end end end - device ref i2c4 off end device ref pcie_rp1 on register "PcieRpEnable[0]" = "1" register "PcieRpClkReqSupport[0]" = "1" @@ -337,19 +325,7 @@ 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" @@ -358,9 +334,7 @@ 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 on end device ref lpc_espi on # EC host command ranges are in 0x800-0x8ff & 0x200-0x20f @@ -373,11 +347,8 @@ 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 diff --git a/src/mainboard/google/poppy/variants/soraka/devicetree.cb b/src/mainboard/google/poppy/variants/soraka/devicetree.cb index 5cb0f7d..2d1a509 100644 --- a/src/mainboard/google/poppy/variants/soraka/devicetree.cb +++ b/src/mainboard/google/poppy/variants/soraka/devicetree.cb @@ -227,7 +227,6 @@ 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 @@ -274,13 +273,7 @@ end end device ref i2c2 on end - device ref i2c3 off 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 @@ -323,23 +316,8 @@ 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 @@ -352,11 +330,8 @@ 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