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>
This commit is contained in:
Gwendal Grignou 2021-03-22 12:59:02 -07:00 committed by Patrick Georgi
parent fd977f2f11
commit 2f135a9a69
9 changed files with 37 additions and 45 deletions

View File

@ -130,13 +130,12 @@ chip soc/intel/cannonlake
register "speed" = "I2C_SPEED_FAST" register "speed" = "I2C_SPEED_FAST"
register "uid" = "1" register "uid" = "1"
register "cs0_ground" = "0x0" register "cs0_ground" = "0x0"
register "combined_sensors_count" = "3" register "combined_sensors_count" = "2"
register "combined_sensors[0]" = "0" register "combined_sensors[0]" = "1"
register "combined_sensors[1]" = "1" register "combined_sensors[1]" = "2"
register "combined_sensors[2]" = "2"
register "resolution" = "SX9310_FINEST" register "resolution" = "SX9310_FINEST"
register "avg_pos_strength" = "512" register "avg_pos_strength" = "512"
register "startup_sensor" = "0" register "startup_sensor" = "1"
register "proxraw_strength" = "0" register "proxraw_strength" = "0"
device i2c 28 on end device i2c 28 on end
end end

View File

@ -150,13 +150,12 @@ chip soc/intel/cannonlake
register "speed" = "I2C_SPEED_FAST" register "speed" = "I2C_SPEED_FAST"
register "uid" = "1" register "uid" = "1"
register "cs0_ground" = "0x0" register "cs0_ground" = "0x0"
register "combined_sensors_count" = "3" register "combined_sensors_count" = "2"
register "combined_sensors[0]" = "0" register "combined_sensors[0]" = "1"
register "combined_sensors[1]" = "1" register "combined_sensors[1]" = "2"
register "combined_sensors[2]" = "2"
register "resolution" = "SX9310_FINEST" register "resolution" = "SX9310_FINEST"
register "avg_pos_strength" = "512" register "avg_pos_strength" = "512"
register "startup_sensor" = "0" register "startup_sensor" = "1"
register "proxraw_strength" = "0" register "proxraw_strength" = "0"
device i2c 28 on end device i2c 28 on end
end end

View File

@ -122,13 +122,12 @@ chip soc/intel/apollolake
register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_214_IRQ)" register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_214_IRQ)"
register "uid" = "1" register "uid" = "1"
register "cs0_ground" = "0x0" register "cs0_ground" = "0x0"
register "combined_sensors_count" = "3" register "combined_sensors_count" = "2"
register "combined_sensors[0]" = "0" register "combined_sensors[0]" = "1"
register "combined_sensors[1]" = "1" register "combined_sensors[1]" = "2"
register "combined_sensors[2]" = "2"
register "resolution" = "SX9310_FINEST" register "resolution" = "SX9310_FINEST"
register "avg_pos_strength" = "512" register "avg_pos_strength" = "512"
register "startup_sensor" = "0" register "startup_sensor" = "1"
register "proxraw_strength" = "0" register "proxraw_strength" = "0"
device i2c 28 on end device i2c 28 on end
end end

View File

@ -83,13 +83,12 @@ chip soc/intel/tigerlake
register "speed" = "I2C_SPEED_FAST" register "speed" = "I2C_SPEED_FAST"
register "uid" = "0" register "uid" = "0"
register "cs0_ground" = "0x0" register "cs0_ground" = "0x0"
register "combined_sensors_count" = "3" register "combined_sensors_count" = "2"
register "combined_sensors[0]" = "0" register "combined_sensors[0]" = "1"
register "combined_sensors[1]" = "1" register "combined_sensors[1]" = "2"
register "combined_sensors[2]" = "2"
register "resolution" = "SX9310_FINEST" register "resolution" = "SX9310_FINEST"
register "avg_pos_strength" = "512" register "avg_pos_strength" = "512"
register "startup_sensor" = "0" register "startup_sensor" = "1"
register "proxraw_strength" = "0" register "proxraw_strength" = "0"
device i2c 28 on end device i2c 28 on end
end end

View File

@ -69,13 +69,12 @@ chip soc/intel/tigerlake
register "speed" = "I2C_SPEED_FAST" register "speed" = "I2C_SPEED_FAST"
register "uid" = "0" register "uid" = "0"
register "cs0_ground" = "0x0" register "cs0_ground" = "0x0"
register "combined_sensors_count" = "3" register "combined_sensors_count" = "2"
register "combined_sensors[0]" = "0" register "combined_sensors[0]" = "1"
register "combined_sensors[1]" = "1" register "combined_sensors[1]" = "2"
register "combined_sensors[2]" = "2"
register "resolution" = "SX9310_FINEST" register "resolution" = "SX9310_FINEST"
register "avg_pos_strength" = "512" register "avg_pos_strength" = "512"
register "startup_sensor" = "0" register "startup_sensor" = "1"
register "proxraw_strength" = "0" register "proxraw_strength" = "0"
device i2c 28 on end device i2c 28 on end
end end

View File

@ -40,13 +40,12 @@ chip soc/intel/tigerlake
register "speed" = "I2C_SPEED_FAST" register "speed" = "I2C_SPEED_FAST"
register "uid" = "0" register "uid" = "0"
register "cs0_ground" = "0x0" register "cs0_ground" = "0x0"
register "combined_sensors_count" = "3" register "combined_sensors_count" = "2"
register "combined_sensors[0]" = "0" register "combined_sensors[0]" = "1"
register "combined_sensors[1]" = "1" register "combined_sensors[1]" = "2"
register "combined_sensors[2]" = "2"
register "resolution" = "SX9310_FINEST" register "resolution" = "SX9310_FINEST"
register "avg_pos_strength" = "512" register "avg_pos_strength" = "512"
register "startup_sensor" = "0" register "startup_sensor" = "1"
register "proxraw_strength" = "0" register "proxraw_strength" = "0"
device i2c 28 on end device i2c 28 on end
end end

View File

@ -144,13 +144,12 @@ chip soc/intel/tigerlake
register "speed" = "I2C_SPEED_FAST" register "speed" = "I2C_SPEED_FAST"
register "uid" = "0" register "uid" = "0"
register "cs0_ground" = "0x0" register "cs0_ground" = "0x0"
register "combined_sensors_count" = "3" register "combined_sensors_count" = "2"
register "combined_sensors[0]" = "0" register "combined_sensors[0]" = "1"
register "combined_sensors[1]" = "1" register "combined_sensors[1]" = "2"
register "combined_sensors[2]" = "2"
register "resolution" = "SX9310_FINEST" register "resolution" = "SX9310_FINEST"
register "avg_pos_strength" = "512" register "avg_pos_strength" = "512"
register "startup_sensor" = "0" register "startup_sensor" = "1"
register "proxraw_strength" = "0" register "proxraw_strength" = "0"
device i2c 28 on end device i2c 28 on end
end end

View File

@ -202,12 +202,12 @@ chip soc/intel/tigerlake
register "speed" = "I2C_SPEED_FAST" register "speed" = "I2C_SPEED_FAST"
register "uid" = "0" register "uid" = "0"
register "cs0_ground" = "0x0" register "cs0_ground" = "0x0"
register "combined_sensors_count" = "3" register "combined_sensors_count" = "2"
register "combined_sensors[0]" = "0" register "combined_sensors[0]" = "1"
register "combined_sensors[1]" = "1" register "combined_sensors[1]" = "2"
register "combined_sensors[2]" = "2" register "resolution" = "SX9310_FINEST"
register "avg_pos_strength" = "512" register "avg_pos_strength" = "512"
register "startup_sensor" = "0" register "startup_sensor" = "1"
register "proxraw_strength" = "0" register "proxraw_strength" = "0"
device i2c 28 on end device i2c 28 on end
end end

View File

@ -167,13 +167,12 @@ chip soc/intel/tigerlake
register "speed" = "I2C_SPEED_FAST" register "speed" = "I2C_SPEED_FAST"
register "uid" = "0" register "uid" = "0"
register "cs0_ground" = "0x0" register "cs0_ground" = "0x0"
register "combined_sensors_count" = "3" register "combined_sensors_count" = "2"
register "combined_sensors[0]" = "0" register "combined_sensors[0]" = "1"
register "combined_sensors[1]" = "1" register "combined_sensors[1]" = "2"
register "combined_sensors[2]" = "2"
register "resolution" = "SX9310_FINEST" register "resolution" = "SX9310_FINEST"
register "avg_pos_strength" = "512" register "avg_pos_strength" = "512"
register "startup_sensor" = "0" register "startup_sensor" = "1"
register "proxraw_strength" = "0" register "proxraw_strength" = "0"
device i2c 28 on end device i2c 28 on end
end end