summaryrefslogtreecommitdiff
path: root/src/mainboard/google/glados/variants
diff options
context:
space:
mode:
authorFelix Singer <felixsinger@posteo.net>2023-11-12 19:05:03 +0000
committerFelix Singer <service+coreboot-gerrit@felixsinger.de>2023-11-14 05:58:30 +0000
commit3b3ac15da92801bdc781ec13e59a7a443c0811c9 (patch)
treedbf2e8bd907b7354faaf40eda09ce91e0dbe6fe1 /src/mainboard/google/glados/variants
parent1f7510f577ca4fd5b5b355261a256a5184027e67 (diff)
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 <felixsinger@posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/79043 Reviewed-by: Eric Lai <ericllai@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/google/glados/variants')
-rw-r--r--src/mainboard/google/glados/variants/asuka/overridetree.cb16
-rw-r--r--src/mainboard/google/glados/variants/caroline/overridetree.cb16
-rw-r--r--src/mainboard/google/glados/variants/cave/overridetree.cb18
-rw-r--r--src/mainboard/google/glados/variants/chell/overridetree.cb8
-rw-r--r--src/mainboard/google/glados/variants/glados/overridetree.cb14
-rw-r--r--src/mainboard/google/glados/variants/lars/overridetree.cb17
-rw-r--r--src/mainboard/google/glados/variants/sentry/overridetree.cb18
7 files changed, 53 insertions, 54 deletions
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 16:23:23 +0000