From 3b3ac15da92801bdc781ec13e59a7a443c0811c9 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sun, 12 Nov 2023 19:05:03 +0000 Subject: mb/google/glados: Make use of the chipset devicetree Use the references from the chipset devicetree as this makes the comments superfluous and remove devices which are turned off. Change-Id: I4f2c4f4a576ea2fd2ccb7a7e6b52cf258bac5f84 Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/79043 Reviewed-by: Eric Lai Tested-by: build bot (Jenkins) --- src/mainboard/google/glados/devicetree.cb | 66 ++++++---------------- .../google/glados/variants/asuka/overridetree.cb | 16 +++--- .../glados/variants/caroline/overridetree.cb | 16 +++--- .../google/glados/variants/cave/overridetree.cb | 18 +++--- .../google/glados/variants/chell/overridetree.cb | 8 +-- .../google/glados/variants/glados/overridetree.cb | 14 ++--- .../google/glados/variants/lars/overridetree.cb | 17 +++--- .../google/glados/variants/sentry/overridetree.cb | 18 +++--- 8 files changed, 71 insertions(+), 102 deletions(-) (limited to 'src') diff --git a/src/mainboard/google/glados/devicetree.cb b/src/mainboard/google/glados/devicetree.cb index f7c181944a..58b421c19c 100644 --- a/src/mainboard/google/glados/devicetree.cb +++ b/src/mainboard/google/glados/devicetree.cb @@ -83,63 +83,33 @@ chip soc/intel/skylake device cpu_cluster 0 on end 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 end # SA thermal subsystem - device pci 14.0 on end # USB xHCI - device pci 14.1 off end # USB xDCI (OTG) - device pci 14.2 on end # Thermal Subsystem - device pci 14.3 off end # Camera - device pci 15.0 on end # I2C #0 - device pci 15.1 on 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 17.0 off end # SATA - device pci 19.0 on end # UART #2 - device pci 19.1 off end # I2C #5 - device pci 19.2 on end # I2C #4 - device pci 1c.0 on + device ref igpu on end + device ref sa_thermal on end + device ref south_xhci on end + device ref thermal on end + device ref i2c0 on end + device ref i2c1 on end + device ref heci1 on end + device ref uart2 on end + device ref i2c4 on end + device ref pcie_rp1 on chip drivers/wifi/generic register "wake" = "GPE0_DW0_16" device pci 00.0 on end end - end # PCI Express Port 1 - device pci 1c.1 off end # PCI Express Port 2 - device pci 1c.2 off end # PCI Express Port 3 - device pci 1c.3 off end # PCI Express Port 4 - device pci 1c.4 off end # PCI Express Port 5 - device pci 1c.5 off end # PCI Express Port 6 - device pci 1c.6 off end # PCI Express Port 7 - device pci 1c.7 off end # PCI Express Port 8 - device pci 1d.0 off end # PCI Express Port 9 - device pci 1d.1 off end # PCI Express Port 10 - device pci 1d.2 off end # PCI Express Port 11 - device pci 1d.3 off end # PCI Express Port 12 - 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 off end # GSPI #1 - device pci 1e.4 on end # eMMC - device pci 1e.5 off end # SDIO - device pci 1e.6 off end # SDCard - device pci 1f.0 on + end + device ref uart0 on end + device ref emmc on end + device ref lpc_espi on chip drivers/pc80/tpm device pnp 0c31.0 on end end chip ec/google/chromeec device pnp 0c09.0 on end end - end # LPC Interface - device pci 1f.1 on end # P2SB - device pci 1f.2 on 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 + device ref fast_spi on end end end diff --git a/src/mainboard/google/glados/variants/asuka/overridetree.cb b/src/mainboard/google/glados/variants/asuka/overridetree.cb index 4be1fc6ae3..61220eee90 100644 --- a/src/mainboard/google/glados/variants/asuka/overridetree.cb +++ b/src/mainboard/google/glados/variants/asuka/overridetree.cb @@ -14,15 +14,15 @@ chip soc/intel/skylake register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC3)" # Type-A Port (board) device domain 0 on - device pci 15.0 on + device ref i2c0 on chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E7_IRQ)" device i2c 10 on end end - end # I2C #0 - device pci 15.1 on + end + device ref i2c1 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -30,8 +30,8 @@ chip soc/intel/skylake register "wake" = "GPE0_DW0_05" device i2c 15 on end end - end # I2C #1 - device pci 19.2 on + end + device ref i2c4 on chip drivers/i2c/nau8825 register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F10_IRQ)" register "jkdet_enable" = "1" @@ -53,14 +53,14 @@ chip soc/intel/skylake register "jack_eject_debounce" = "0" device i2c 1a on end end - end # I2C #4 - device pci 1f.3 on + end + device ref hda on chip drivers/generic/max98357a register "hid" = ""MX98357A"" register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E3)" register "sdmode_delay" = "5" device generic 0 on end end - end # Intel HDA + end end end diff --git a/src/mainboard/google/glados/variants/caroline/overridetree.cb b/src/mainboard/google/glados/variants/caroline/overridetree.cb index 0e6d5e7c63..6ea484520f 100644 --- a/src/mainboard/google/glados/variants/caroline/overridetree.cb +++ b/src/mainboard/google/glados/variants/caroline/overridetree.cb @@ -38,15 +38,15 @@ chip soc/intel/skylake register "tcc_offset" = "10" device domain 0 on - device pci 15.0 on + device ref i2c0 on chip drivers/i2c/generic register "hid" = ""ATML0001"" register "desc" = ""Atmel Touchscreen"" register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E7_IRQ)" device i2c 4b on end end - end # I2C #0 - device pci 15.1 on + end + device ref i2c1 on chip drivers/i2c/generic register "hid" = ""ATML0000"" register "desc" = ""Atmel Touchpad"" @@ -54,9 +54,9 @@ chip soc/intel/skylake register "wake" = "GPE0_DW0_05" device i2c 4a on end end - end # I2C #1 - device pci 15.2 on end # I2C #2 - device pci 19.2 on + end + device ref i2c2 on end + device ref i2c4 on chip drivers/i2c/nau8825 register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F10_IRQ)" register "jkdet_enable" = "1" @@ -90,7 +90,7 @@ chip soc/intel/skylake register "uid" = "1" device i2c 35 on end end - end # I2C #4 - device pci 1e.6 on end # SDCard + end + device ref sdxc on end end end diff --git a/src/mainboard/google/glados/variants/cave/overridetree.cb b/src/mainboard/google/glados/variants/cave/overridetree.cb index bd3c13959c..7d78d6b532 100644 --- a/src/mainboard/google/glados/variants/cave/overridetree.cb +++ b/src/mainboard/google/glados/variants/cave/overridetree.cb @@ -26,15 +26,15 @@ chip soc/intel/skylake register "sdcard_cd_gpio" = "GPP_A7" device domain 0 on - device pci 15.0 on + device ref i2c0 on chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E7_IRQ)" device i2c 10 on end end - end # I2C #0 - device pci 15.1 on + end + device ref i2c1 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -42,8 +42,8 @@ chip soc/intel/skylake register "wake" = "GPE0_DW0_05" device i2c 15 on end end - end # I2C #1 - device pci 19.2 on + end + device ref i2c4 on chip drivers/i2c/nau8825 register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F10_IRQ)" register "jkdet_enable" = "1" @@ -65,15 +65,15 @@ chip soc/intel/skylake register "jack_eject_debounce" = "7" # 512ms device i2c 1a on end end - end # I2C #4 - device pci 1e.6 on end # SDCard - device pci 1f.3 on + end + device ref sdxc on end + device ref hda on chip drivers/generic/max98357a register "hid" = ""MX98357A"" register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E3)" register "sdmode_delay" = "5" device generic 0 on end end - end # Intel HDA + end end end diff --git a/src/mainboard/google/glados/variants/chell/overridetree.cb b/src/mainboard/google/glados/variants/chell/overridetree.cb index ad3ae391c7..9e4b7f0fc7 100644 --- a/src/mainboard/google/glados/variants/chell/overridetree.cb +++ b/src/mainboard/google/glados/variants/chell/overridetree.cb @@ -27,7 +27,7 @@ chip soc/intel/skylake register "tcc_offset" = "10" device domain 0 on - device pci 15.1 on + device ref i2c1 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -35,8 +35,8 @@ chip soc/intel/skylake register "wake" = "GPE0_DW0_05" device i2c 15 on end end - end # I2C #1 - device pci 19.2 on + end + device ref i2c4 on chip drivers/i2c/nau8825 register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F10_IRQ)" register "jkdet_enable" = "1" @@ -70,6 +70,6 @@ chip soc/intel/skylake register "uid" = "1" device i2c 35 on end end - end # I2C #4 + end end end diff --git a/src/mainboard/google/glados/variants/glados/overridetree.cb b/src/mainboard/google/glados/variants/glados/overridetree.cb index 3a0fdd4418..3bd4e3ab53 100644 --- a/src/mainboard/google/glados/variants/glados/overridetree.cb +++ b/src/mainboard/google/glados/variants/glados/overridetree.cb @@ -27,15 +27,15 @@ chip soc/intel/skylake register "tcc_offset" = "10" device domain 0 on - device pci 15.0 on + device ref i2c0 on chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E7_IRQ)" device i2c 10 on end end - end # I2C #0 - device pci 15.1 on + end + device ref i2c1 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -43,8 +43,8 @@ chip soc/intel/skylake register "wake" = "GPE0_DW0_05" device i2c 15 on end end - end # I2C #1 - device pci 19.2 on + end + device ref i2c4 on chip drivers/i2c/nau8825 register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F10_IRQ)" register "jkdet_enable" = "1" @@ -78,7 +78,7 @@ chip soc/intel/skylake register "uid" = "1" device i2c 35 on end end - end # I2C #4 - device pci 1e.6 on end # SDCard + end + device ref sdxc on end end end diff --git a/src/mainboard/google/glados/variants/lars/overridetree.cb b/src/mainboard/google/glados/variants/lars/overridetree.cb index ce32b6b0c9..122cfe607c 100644 --- a/src/mainboard/google/glados/variants/lars/overridetree.cb +++ b/src/mainboard/google/glados/variants/lars/overridetree.cb @@ -13,15 +13,15 @@ chip soc/intel/skylake register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC3)" # Type-A Port (board) device domain 0 on - device pci 15.0 on + device ref i2c0 on chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E7_IRQ)" device i2c 10 on end end - end # I2C #0 - device pci 15.1 on + end + device ref i2c1 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -29,8 +29,8 @@ chip soc/intel/skylake register "wake" = "GPE0_DW0_05" device i2c 15 on end end - end # I2C #1 - device pci 19.2 on + end + device ref i2c4 on chip drivers/i2c/nau8825 register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F10_IRQ)" register "jkdet_enable" = "1" @@ -53,15 +53,14 @@ chip soc/intel/skylake register "jack_eject_debounce" = "0" device i2c 1a on end end - end # I2C #4 - device pci 1e.6 off end # SDCard - device pci 1f.3 on + end + device ref hda on chip drivers/generic/max98357a register "hid" = ""MX98357A"" register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_B2)" register "sdmode_delay" = "5" device generic 0 on end end - end # Intel HDA + end end end diff --git a/src/mainboard/google/glados/variants/sentry/overridetree.cb b/src/mainboard/google/glados/variants/sentry/overridetree.cb index 28bc2fbb2d..e052502514 100644 --- a/src/mainboard/google/glados/variants/sentry/overridetree.cb +++ b/src/mainboard/google/glados/variants/sentry/overridetree.cb @@ -19,15 +19,15 @@ chip soc/intel/skylake register "sdcard_cd_gpio" = "GPP_A7" device domain 0 on - device pci 15.0 on + device ref i2c0 on chip drivers/i2c/generic register "hid" = ""RAYD0001"" register "desc" = ""Raydium Touchscreen"" register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E7_IRQ)" device i2c 39 on end end - end # I2C #0 - device pci 15.1 on + end + device ref i2c1 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -35,8 +35,8 @@ chip soc/intel/skylake register "wake" = "GPE0_DW0_05" device i2c 15 on end end - end # I2C #1 - device pci 19.2 on + end + device ref i2c4 on chip drivers/i2c/nau8825 register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F10_IRQ)" register "jkdet_enable" = "1" @@ -73,9 +73,9 @@ chip soc/intel/skylake register "device_present_gpio" = "GPP_E3" device i2c 35 on end end - end # I2C #4 - device pci 1e.6 on end # SDCard - device pci 1f.3 on + end + device ref sdxc on end + device ref hda on chip drivers/generic/max98357a register "hid" = ""MX98357A"" register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E3)" @@ -84,6 +84,6 @@ chip soc/intel/skylake register "sdmode_delay" = "5" device generic 0 on end end - end # Intel HDA + end end end -- cgit v1.2.3