aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@gmail.com>2023-10-22 13:24:52 -0500
committerMatt DeVillier <matt.devillier@amd.corp-partner.google.com>2023-10-24 13:15:09 +0000
commitb4eff88cbb541d7a8e81d408a5ca360c8105bf15 (patch)
tree561e96a807ddcb289e406678557f1c30234d857d
parent1a59390f2d167ad335e3b9f62be92cf55d8d31ae (diff)
mb/google/hatch: Default GSPI1 (FPR) to off in baseboard
Default GSPI1 (fingerprint reader) to off in baseboard, since all variants which use one already enable it in their override tree. This allows variants which do not use it to drop it from their override trees. Change-Id: I07979e35b67635ceadd3906e37de177dd081d35a Signed-off-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/78547 Reviewed-by: Yuchen He <yuchenhe126@gmail.com> Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/mainboard/google/hatch/variants/akemi/overridetree.cb1
-rw-r--r--src/mainboard/google/hatch/variants/baseboard/devicetree.cb2
-rw-r--r--src/mainboard/google/hatch/variants/kindred/overridetree.cb1
-rw-r--r--src/mainboard/google/hatch/variants/nightfury/overridetree.cb1
-rw-r--r--src/mainboard/google/hatch/variants/palkia/overridetree.cb2
5 files changed, 1 insertions, 6 deletions
diff --git a/src/mainboard/google/hatch/variants/akemi/overridetree.cb b/src/mainboard/google/hatch/variants/akemi/overridetree.cb
index 0aefc5ec3d..72d855f0ac 100644
--- a/src/mainboard/google/hatch/variants/akemi/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/akemi/overridetree.cb
@@ -234,7 +234,6 @@ chip soc/intel/cannonlake
end
end #I2C #4
device pci 1a.0 on end # eMMC
- device pci 1e.3 off end # GSPI #1
device pci 1f.3 on
chip drivers/generic/max98357a
register "hid" = ""MX98357A""
diff --git a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb
index b57afd4957..6837010339 100644
--- a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb
@@ -337,7 +337,7 @@ chip soc/intel/cannonlake
device spi 0 on end
end
end # GSPI #0
- device pci 1e.3 on end # GSPI #1
+ device pci 1e.3 off end # GSPI #1
device pci 1f.0 on
chip ec/google/chromeec
device pnp 0c09.0 on end
diff --git a/src/mainboard/google/hatch/variants/kindred/overridetree.cb b/src/mainboard/google/hatch/variants/kindred/overridetree.cb
index a2c9322fbb..c2f1db67fc 100644
--- a/src/mainboard/google/hatch/variants/kindred/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/kindred/overridetree.cb
@@ -203,7 +203,6 @@ chip soc/intel/cannonlake
end
end #I2C #4
device pci 1a.0 on end # eMMC
- device pci 1e.3 off end # GSPI #1 unused
device pci 1f.3 on
chip drivers/generic/max98357a
register "hid" = ""MX98357A""
diff --git a/src/mainboard/google/hatch/variants/nightfury/overridetree.cb b/src/mainboard/google/hatch/variants/nightfury/overridetree.cb
index 433abaea42..da514a2b6d 100644
--- a/src/mainboard/google/hatch/variants/nightfury/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/nightfury/overridetree.cb
@@ -262,7 +262,6 @@ chip soc/intel/cannonlake
# No PCIe WiFi
device pci 1d.5 off end
device pci 1a.0 on end #eMMC
- device pci 1e.3 off end # GSPI #1
device pci 1f.3 on
chip drivers/sof
register "spkr_tplg" = "max98390"
diff --git a/src/mainboard/google/hatch/variants/palkia/overridetree.cb b/src/mainboard/google/hatch/variants/palkia/overridetree.cb
index eaf038f468..b6920e98ae 100644
--- a/src/mainboard/google/hatch/variants/palkia/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/palkia/overridetree.cb
@@ -183,8 +183,6 @@ chip soc/intel/cannonlake
device i2c 39 on end
end
end #I2C #4
- # GSPI #1 unused
- device pci 1e.3 off end
device pci 1f.3 on
chip drivers/generic/max98357a