diff options
| author | Gwendal Grignou <gwendal@chromium.org> | 2021-03-22 12:59:02 -0700 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2021-06-22 04:41:39 +0000 |
| commit | 2f135a9a69c724a95d6d50571118478a757020b3 (patch) | |
| tree | 0198f2ab850ad8bf39aa4c21026c786cdc5e121f /src/mainboard | |
| parent | fd977f2f11ab54742d54c3d3486dc3897fc299aa (diff) | |
drivers/i2c: sx9310: fix overridetree.cb
An error in script did not set the attribute properly:
- Entry CS0 is not used as sensor, but as ground,
- Entry CS1 is used as the startup sensor.
This fixes a regression caused by commit
689c25b9d6 (drivers/i2c: sx9310: Replace register map with descriptive names)
EQ=b:173341604
BRANCH=volteer
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Change-Id: I92c01209031e9a917d95b1cb2537b0ce7b93e66d
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51893
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard')
9 files changed, 37 insertions, 45 deletions
diff --git a/src/mainboard/google/hatch/variants/hatch/overridetree.cb b/src/mainboard/google/hatch/variants/hatch/overridetree.cb index ca2eb04570..bf21bf1762 100644 --- a/src/mainboard/google/hatch/variants/hatch/overridetree.cb +++ b/src/mainboard/google/hatch/variants/hatch/overridetree.cb @@ -130,13 +130,12 @@ chip soc/intel/cannonlake register "speed" = "I2C_SPEED_FAST" register "uid" = "1" register "cs0_ground" = "0x0" - register "combined_sensors_count" = "3" - register "combined_sensors[0]" = "0" - register "combined_sensors[1]" = "1" - register "combined_sensors[2]" = "2" + register "combined_sensors_count" = "2" + register "combined_sensors[0]" = "1" + register "combined_sensors[1]" = "2" register "resolution" = "SX9310_FINEST" register "avg_pos_strength" = "512" - register "startup_sensor" = "0" + register "startup_sensor" = "1" register "proxraw_strength" = "0" device i2c 28 on end end diff --git a/src/mainboard/google/hatch/variants/mushu/overridetree.cb b/src/mainboard/google/hatch/variants/mushu/overridetree.cb index 71d339a99b..0edea30441 100644 --- a/src/mainboard/google/hatch/variants/mushu/overridetree.cb +++ b/src/mainboard/google/hatch/variants/mushu/overridetree.cb @@ -150,13 +150,12 @@ chip soc/intel/cannonlake register "speed" = "I2C_SPEED_FAST" register "uid" = "1" register "cs0_ground" = "0x0" - register "combined_sensors_count" = "3" - register "combined_sensors[0]" = "0" - register "combined_sensors[1]" = "1" - register "combined_sensors[2]" = "2" + register "combined_sensors_count" = "2" + register "combined_sensors[0]" = "1" + register "combined_sensors[1]" = "2" register "resolution" = "SX9310_FINEST" register "avg_pos_strength" = "512" - register "startup_sensor" = "0" + register "startup_sensor" = "1" register "proxraw_strength" = "0" device i2c 28 on end end diff --git a/src/mainboard/google/octopus/variants/bobba/overridetree.cb b/src/mainboard/google/octopus/variants/bobba/overridetree.cb index 0eff4353c9..c43153ac33 100644 --- a/src/mainboard/google/octopus/variants/bobba/overridetree.cb +++ b/src/mainboard/google/octopus/variants/bobba/overridetree.cb @@ -122,13 +122,12 @@ chip soc/intel/apollolake register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_214_IRQ)" register "uid" = "1" register "cs0_ground" = "0x0" - register "combined_sensors_count" = "3" - register "combined_sensors[0]" = "0" - register "combined_sensors[1]" = "1" - register "combined_sensors[2]" = "2" + register "combined_sensors_count" = "2" + register "combined_sensors[0]" = "1" + register "combined_sensors[1]" = "2" register "resolution" = "SX9310_FINEST" register "avg_pos_strength" = "512" - register "startup_sensor" = "0" + register "startup_sensor" = "1" register "proxraw_strength" = "0" device i2c 28 on end end diff --git a/src/mainboard/google/volteer/variants/halvor/overridetree.cb b/src/mainboard/google/volteer/variants/halvor/overridetree.cb index c875ee3866..02ef0c2d45 100644 --- a/src/mainboard/google/volteer/variants/halvor/overridetree.cb +++ b/src/mainboard/google/volteer/variants/halvor/overridetree.cb @@ -83,13 +83,12 @@ chip soc/intel/tigerlake register "speed" = "I2C_SPEED_FAST" register "uid" = "0" register "cs0_ground" = "0x0" - register "combined_sensors_count" = "3" - register "combined_sensors[0]" = "0" - register "combined_sensors[1]" = "1" - register "combined_sensors[2]" = "2" + register "combined_sensors_count" = "2" + register "combined_sensors[0]" = "1" + register "combined_sensors[1]" = "2" register "resolution" = "SX9310_FINEST" register "avg_pos_strength" = "512" - register "startup_sensor" = "0" + register "startup_sensor" = "1" register "proxraw_strength" = "0" device i2c 28 on end end diff --git a/src/mainboard/google/volteer/variants/malefor/overridetree.cb b/src/mainboard/google/volteer/variants/malefor/overridetree.cb index 0d25df89fd..f1f86b9e1b 100644 --- a/src/mainboard/google/volteer/variants/malefor/overridetree.cb +++ b/src/mainboard/google/volteer/variants/malefor/overridetree.cb @@ -69,13 +69,12 @@ chip soc/intel/tigerlake register "speed" = "I2C_SPEED_FAST" register "uid" = "0" register "cs0_ground" = "0x0" - register "combined_sensors_count" = "3" - register "combined_sensors[0]" = "0" - register "combined_sensors[1]" = "1" - register "combined_sensors[2]" = "2" + register "combined_sensors_count" = "2" + register "combined_sensors[0]" = "1" + register "combined_sensors[1]" = "2" register "resolution" = "SX9310_FINEST" register "avg_pos_strength" = "512" - register "startup_sensor" = "0" + register "startup_sensor" = "1" register "proxraw_strength" = "0" device i2c 28 on end end diff --git a/src/mainboard/google/volteer/variants/trondo/overridetree.cb b/src/mainboard/google/volteer/variants/trondo/overridetree.cb index a7de5ead31..a24d356e4c 100644 --- a/src/mainboard/google/volteer/variants/trondo/overridetree.cb +++ b/src/mainboard/google/volteer/variants/trondo/overridetree.cb @@ -40,13 +40,12 @@ chip soc/intel/tigerlake register "speed" = "I2C_SPEED_FAST" register "uid" = "0" register "cs0_ground" = "0x0" - register "combined_sensors_count" = "3" - register "combined_sensors[0]" = "0" - register "combined_sensors[1]" = "1" - register "combined_sensors[2]" = "2" + register "combined_sensors_count" = "2" + register "combined_sensors[0]" = "1" + register "combined_sensors[1]" = "2" register "resolution" = "SX9310_FINEST" register "avg_pos_strength" = "512" - register "startup_sensor" = "0" + register "startup_sensor" = "1" register "proxraw_strength" = "0" device i2c 28 on end end diff --git a/src/mainboard/google/volteer/variants/volteer/overridetree.cb b/src/mainboard/google/volteer/variants/volteer/overridetree.cb index 786ac02bde..624cc874d7 100644 --- a/src/mainboard/google/volteer/variants/volteer/overridetree.cb +++ b/src/mainboard/google/volteer/variants/volteer/overridetree.cb @@ -144,13 +144,12 @@ chip soc/intel/tigerlake register "speed" = "I2C_SPEED_FAST" register "uid" = "0" register "cs0_ground" = "0x0" - register "combined_sensors_count" = "3" - register "combined_sensors[0]" = "0" - register "combined_sensors[1]" = "1" - register "combined_sensors[2]" = "2" + register "combined_sensors_count" = "2" + register "combined_sensors[0]" = "1" + register "combined_sensors[1]" = "2" register "resolution" = "SX9310_FINEST" register "avg_pos_strength" = "512" - register "startup_sensor" = "0" + register "startup_sensor" = "1" register "proxraw_strength" = "0" device i2c 28 on end end diff --git a/src/mainboard/google/volteer/variants/volteer2/overridetree.cb b/src/mainboard/google/volteer/variants/volteer2/overridetree.cb index 4e8302a363..44a753f56f 100644 --- a/src/mainboard/google/volteer/variants/volteer2/overridetree.cb +++ b/src/mainboard/google/volteer/variants/volteer2/overridetree.cb @@ -202,12 +202,12 @@ chip soc/intel/tigerlake register "speed" = "I2C_SPEED_FAST" register "uid" = "0" register "cs0_ground" = "0x0" - register "combined_sensors_count" = "3" - register "combined_sensors[0]" = "0" - register "combined_sensors[1]" = "1" - register "combined_sensors[2]" = "2" + register "combined_sensors_count" = "2" + register "combined_sensors[0]" = "1" + register "combined_sensors[1]" = "2" + register "resolution" = "SX9310_FINEST" register "avg_pos_strength" = "512" - register "startup_sensor" = "0" + register "startup_sensor" = "1" register "proxraw_strength" = "0" device i2c 28 on end end diff --git a/src/mainboard/google/volteer/variants/voxel/overridetree.cb b/src/mainboard/google/volteer/variants/voxel/overridetree.cb index b27e3ee86e..b3619b2697 100644 --- a/src/mainboard/google/volteer/variants/voxel/overridetree.cb +++ b/src/mainboard/google/volteer/variants/voxel/overridetree.cb @@ -167,13 +167,12 @@ chip soc/intel/tigerlake register "speed" = "I2C_SPEED_FAST" register "uid" = "0" register "cs0_ground" = "0x0" - register "combined_sensors_count" = "3" - register "combined_sensors[0]" = "0" - register "combined_sensors[1]" = "1" - register "combined_sensors[2]" = "2" + register "combined_sensors_count" = "2" + register "combined_sensors[0]" = "1" + register "combined_sensors[1]" = "2" register "resolution" = "SX9310_FINEST" register "avg_pos_strength" = "512" - register "startup_sensor" = "0" + register "startup_sensor" = "1" register "proxraw_strength" = "0" device i2c 28 on end end |