From 331fa19dcf43e9f263646680eaedb7c8058216b5 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Sun, 22 Oct 2023 13:28:37 -0500 Subject: mb/google/hatch: Default I2C2 (digitizer) to off in baseboard Default I2C2 (digitizer) to off in the baseboard, since all variants which use one already enable it in their override tree. This allows variants which do not use it (the majority) to drop it from their override trees. Change-Id: Ife42a6b849278362c1951b80b7a95363e68a2541 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/78548 Reviewed-by: Yuchen He Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer --- src/mainboard/google/hatch/variants/akemi/overridetree.cb | 1 - src/mainboard/google/hatch/variants/baseboard/devicetree.cb | 2 +- src/mainboard/google/hatch/variants/dratini/overridetree.cb | 1 - src/mainboard/google/hatch/variants/hatch/overridetree.cb | 1 - src/mainboard/google/hatch/variants/helios/overridetree.cb | 3 --- src/mainboard/google/hatch/variants/helios_diskswap/overridetree.cb | 3 --- src/mainboard/google/hatch/variants/jinlon/overridetree.cb | 1 - src/mainboard/google/hatch/variants/kindred/overridetree.cb | 1 - src/mainboard/google/hatch/variants/mushu/overridetree.cb | 1 - src/mainboard/google/hatch/variants/nightfury/overridetree.cb | 2 -- 10 files changed, 1 insertion(+), 15 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/google/hatch/variants/akemi/overridetree.cb b/src/mainboard/google/hatch/variants/akemi/overridetree.cb index 72d855f0ac..739caacdf8 100644 --- a/src/mainboard/google/hatch/variants/akemi/overridetree.cb +++ b/src/mainboard/google/hatch/variants/akemi/overridetree.cb @@ -217,7 +217,6 @@ chip soc/intel/cannonlake device i2c 5d on end end end # I2C #1 - device pci 15.2 off end # I2C #2 device pci 15.3 off end # I2C #3 device pci 19.0 on chip drivers/i2c/generic diff --git a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb index 6837010339..79337041ac 100644 --- a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb @@ -292,7 +292,7 @@ chip soc/intel/cannonlake device pci 14.5 on end # SDCard device pci 15.0 on end # I2C #0 device pci 15.1 on end # I2C #1 - device pci 15.2 on end # I2C #2 + device pci 15.2 off end # I2C #2 device pci 15.3 on end # I2C #3 device pci 16.0 on end # Management Engine Interface 1 device pci 16.1 off end # Management Engine Interface 2 diff --git a/src/mainboard/google/hatch/variants/dratini/overridetree.cb b/src/mainboard/google/hatch/variants/dratini/overridetree.cb index 66f2b8109c..097e02409a 100644 --- a/src/mainboard/google/hatch/variants/dratini/overridetree.cb +++ b/src/mainboard/google/hatch/variants/dratini/overridetree.cb @@ -143,7 +143,6 @@ chip soc/intel/cannonlake device i2c 15 on end end end # I2C #1 - device pci 15.2 off end # I2C #2 device pci 15.3 off end # I2C #3 device pci 19.0 on chip drivers/i2c/generic diff --git a/src/mainboard/google/hatch/variants/hatch/overridetree.cb b/src/mainboard/google/hatch/variants/hatch/overridetree.cb index 50f8dbf47b..e96eeefbfb 100644 --- a/src/mainboard/google/hatch/variants/hatch/overridetree.cb +++ b/src/mainboard/google/hatch/variants/hatch/overridetree.cb @@ -125,7 +125,6 @@ chip soc/intel/cannonlake device generic 0 on end end end # I2C #1 - device pci 15.2 off end # I2C #2 device pci 15.3 on chip drivers/i2c/sx9310 register "desc" = ""SAR Proximity Sensor"" diff --git a/src/mainboard/google/hatch/variants/helios/overridetree.cb b/src/mainboard/google/hatch/variants/helios/overridetree.cb index 0dc0f1cdef..ec06e018ca 100644 --- a/src/mainboard/google/hatch/variants/helios/overridetree.cb +++ b/src/mainboard/google/hatch/variants/helios/overridetree.cb @@ -136,9 +136,6 @@ chip soc/intel/cannonlake end end # I2C 1 - # I2C #2 unused - device pci 15.2 off end - # I2C #3 unused device pci 15.3 off end diff --git a/src/mainboard/google/hatch/variants/helios_diskswap/overridetree.cb b/src/mainboard/google/hatch/variants/helios_diskswap/overridetree.cb index e18267dbdf..8141486259 100644 --- a/src/mainboard/google/hatch/variants/helios_diskswap/overridetree.cb +++ b/src/mainboard/google/hatch/variants/helios_diskswap/overridetree.cb @@ -148,9 +148,6 @@ chip soc/intel/cannonlake end end # I2C 1 - # I2C #2 unused - device pci 15.2 off end - # I2C #3 unused device pci 15.3 off end diff --git a/src/mainboard/google/hatch/variants/jinlon/overridetree.cb b/src/mainboard/google/hatch/variants/jinlon/overridetree.cb index 8d5ccaf47e..33d81dfb86 100644 --- a/src/mainboard/google/hatch/variants/jinlon/overridetree.cb +++ b/src/mainboard/google/hatch/variants/jinlon/overridetree.cb @@ -167,7 +167,6 @@ chip soc/intel/cannonlake device i2c 15 on end end end # I2C #1 - device pci 15.2 off end # I2C #2 device pci 15.3 off end # I2C #3 device pci 19.0 on chip drivers/i2c/generic diff --git a/src/mainboard/google/hatch/variants/kindred/overridetree.cb b/src/mainboard/google/hatch/variants/kindred/overridetree.cb index c2f1db67fc..547383ff1f 100644 --- a/src/mainboard/google/hatch/variants/kindred/overridetree.cb +++ b/src/mainboard/google/hatch/variants/kindred/overridetree.cb @@ -186,7 +186,6 @@ chip soc/intel/cannonlake device generic 0 on end end end # I2C #1 - device pci 15.2 off end # I2C #2 unused device pci 15.3 off end # I2C #3 unused device pci 19.0 on chip drivers/i2c/generic diff --git a/src/mainboard/google/hatch/variants/mushu/overridetree.cb b/src/mainboard/google/hatch/variants/mushu/overridetree.cb index 82ffb1c6f8..d498f36233 100644 --- a/src/mainboard/google/hatch/variants/mushu/overridetree.cb +++ b/src/mainboard/google/hatch/variants/mushu/overridetree.cb @@ -145,7 +145,6 @@ chip soc/intel/cannonlake device generic 0 on end end end # I2C #1 - device pci 15.2 off end # I2C #2 device pci 15.3 on chip drivers/i2c/sx9310 register "desc" = ""SAR Proximity Sensor"" diff --git a/src/mainboard/google/hatch/variants/nightfury/overridetree.cb b/src/mainboard/google/hatch/variants/nightfury/overridetree.cb index da514a2b6d..2c302194ff 100644 --- a/src/mainboard/google/hatch/variants/nightfury/overridetree.cb +++ b/src/mainboard/google/hatch/variants/nightfury/overridetree.cb @@ -219,8 +219,6 @@ chip soc/intel/cannonlake end end # I2C #1 - device pci 15.2 off end # I2C #2 - device pci 19.0 on chip drivers/i2c/da7219 # TODO: these settings were copied from another board -- cgit v1.2.3