summaryrefslogtreecommitdiff
path: root/src/mainboard/google/volteer
diff options
context:
space:
mode:
authorGwendal Grignou <gwendal@chromium.org>2021-01-27 23:29:38 -0800
committerFurquan Shaikh <furquan@google.com>2021-03-10 19:33:01 +0000
commit689c25b9d6bbd62875f1fb31dca5cc694b8e262f (patch)
tree7eccefd9cd1540dcfd66a6c7f3aeb973a7dad018 /src/mainboard/google/volteer
parente4a7e46a9c1219ebffb94ea3de5181aaaf86f27c (diff)
drivers/i2c: sx9310: Replace register map with descriptive names
The current driver is using chip registers map to configure the SAR sensor, which is opaque, especially when the datasheet is not published widely. Use more descriptive names, as defined in Linux kernel documentation at https://www.kernel.org/doc/Documentation/devicetree/bindings/iio/proximity/semtech%2Csx9310.yaml BUG=b:173341604 BRANCH=volteer TEST=Dump all tables, check semtech property: for i in $(find /sys/firmware/acpi/tables/ -type f) ; do f=$(basename $i); cat $i > /tmp/$f.dat ; iasl -d /tmp/$f.dat done In SSDT.dsl, we have: Package (0x06) { Package (0x02) { "semtech,cs0-ground", Zero }, Package (0x02) { "semtech,startup-sensor", Zero }, Package (0x02) { "semtech,proxraw-strength", Zero }, Package (0x02) { "semtech,avg-pos-strength", 0x0200 }, Package (0x02) { "semtech,combined-sensors", Package (0x03) { Zero, One, 0x02 } }, Package (0x02) { "semtech,resolution", "finest" } } Change-Id: I8d1c81b56eaeef1dbb0f73c1d74c3a20e8b2fd7b Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/50210 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src/mainboard/google/volteer')
-rw-r--r--src/mainboard/google/volteer/variants/halvor/overridetree.cb32
-rw-r--r--src/mainboard/google/volteer/variants/malefor/overridetree.cb32
-rw-r--r--src/mainboard/google/volteer/variants/trondo/overridetree.cb32
-rw-r--r--src/mainboard/google/volteer/variants/volteer/overridetree.cb32
-rw-r--r--src/mainboard/google/volteer/variants/volteer2/overridetree.cb31
-rw-r--r--src/mainboard/google/volteer/variants/voxel/overridetree.cb32
6 files changed, 53 insertions, 138 deletions
diff --git a/src/mainboard/google/volteer/variants/halvor/overridetree.cb b/src/mainboard/google/volteer/variants/halvor/overridetree.cb
index 568ca73c3b..c875ee3866 100644
--- a/src/mainboard/google/volteer/variants/halvor/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/halvor/overridetree.cb
@@ -82,29 +82,15 @@ chip soc/intel/tigerlake
register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F14_IRQ)"
register "speed" = "I2C_SPEED_FAST"
register "uid" = "0"
- register "reg_prox_ctrl0" = "0x10"
- register "reg_prox_ctrl1" = "0x00"
- register "reg_prox_ctrl2" = "0x84"
- register "reg_prox_ctrl3" = "0x0e"
- register "reg_prox_ctrl4" = "0x07"
- register "reg_prox_ctrl5" = "0xc6"
- register "reg_prox_ctrl6" = "0x20"
- register "reg_prox_ctrl7" = "0x0d"
- register "reg_prox_ctrl8" = "0x8d"
- register "reg_prox_ctrl9" = "0x43"
- register "reg_prox_ctrl10" = "0x1f"
- register "reg_prox_ctrl11" = "0x00"
- register "reg_prox_ctrl12" = "0x00"
- register "reg_prox_ctrl13" = "0x00"
- register "reg_prox_ctrl14" = "0x00"
- register "reg_prox_ctrl15" = "0x00"
- register "reg_prox_ctrl16" = "0x00"
- register "reg_prox_ctrl17" = "0x00"
- register "reg_prox_ctrl18" = "0x00"
- register "reg_prox_ctrl19" = "0x00"
- register "reg_sar_ctrl0" = "0x50"
- register "reg_sar_ctrl1" = "0x8a"
- register "reg_sar_ctrl2" = "0x3c"
+ 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 "resolution" = "SX9310_FINEST"
+ register "avg_pos_strength" = "512"
+ register "startup_sensor" = "0"
+ register "proxraw_strength" = "0"
device i2c 28 on end
end
end
diff --git a/src/mainboard/google/volteer/variants/malefor/overridetree.cb b/src/mainboard/google/volteer/variants/malefor/overridetree.cb
index 95dc3f7b45..00d609f702 100644
--- a/src/mainboard/google/volteer/variants/malefor/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/malefor/overridetree.cb
@@ -69,29 +69,15 @@ chip soc/intel/tigerlake
register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F14_IRQ)"
register "speed" = "I2C_SPEED_FAST"
register "uid" = "0"
- register "reg_prox_ctrl0" = "0x10"
- register "reg_prox_ctrl1" = "0x00"
- register "reg_prox_ctrl2" = "0x84"
- register "reg_prox_ctrl3" = "0x0e"
- register "reg_prox_ctrl4" = "0x07"
- register "reg_prox_ctrl5" = "0xc6"
- register "reg_prox_ctrl6" = "0x20"
- register "reg_prox_ctrl7" = "0x0d"
- register "reg_prox_ctrl8" = "0x8d"
- register "reg_prox_ctrl9" = "0x43"
- register "reg_prox_ctrl10" = "0x1f"
- register "reg_prox_ctrl11" = "0x00"
- register "reg_prox_ctrl12" = "0x00"
- register "reg_prox_ctrl13" = "0x00"
- register "reg_prox_ctrl14" = "0x00"
- register "reg_prox_ctrl15" = "0x00"
- register "reg_prox_ctrl16" = "0x00"
- register "reg_prox_ctrl17" = "0x00"
- register "reg_prox_ctrl18" = "0x00"
- register "reg_prox_ctrl19" = "0x00"
- register "reg_sar_ctrl0" = "0x50"
- register "reg_sar_ctrl1" = "0x8a"
- register "reg_sar_ctrl2" = "0x3c"
+ 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 "resolution" = "SX9310_FINEST"
+ register "avg_pos_strength" = "512"
+ register "startup_sensor" = "0"
+ register "proxraw_strength" = "0"
device i2c 28 on end
end
end
diff --git a/src/mainboard/google/volteer/variants/trondo/overridetree.cb b/src/mainboard/google/volteer/variants/trondo/overridetree.cb
index 7169932ae4..a7de5ead31 100644
--- a/src/mainboard/google/volteer/variants/trondo/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/trondo/overridetree.cb
@@ -39,29 +39,15 @@ chip soc/intel/tigerlake
register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F14_IRQ)"
register "speed" = "I2C_SPEED_FAST"
register "uid" = "0"
- register "reg_prox_ctrl0" = "0x10"
- register "reg_prox_ctrl1" = "0x00"
- register "reg_prox_ctrl2" = "0x84"
- register "reg_prox_ctrl3" = "0x0e"
- register "reg_prox_ctrl4" = "0x07"
- register "reg_prox_ctrl5" = "0xc6"
- register "reg_prox_ctrl6" = "0x20"
- register "reg_prox_ctrl7" = "0x0d"
- register "reg_prox_ctrl8" = "0x8d"
- register "reg_prox_ctrl9" = "0x43"
- register "reg_prox_ctrl10" = "0x1f"
- register "reg_prox_ctrl11" = "0x00"
- register "reg_prox_ctrl12" = "0x00"
- register "reg_prox_ctrl13" = "0x00"
- register "reg_prox_ctrl14" = "0x00"
- register "reg_prox_ctrl15" = "0x00"
- register "reg_prox_ctrl16" = "0x00"
- register "reg_prox_ctrl17" = "0x00"
- register "reg_prox_ctrl18" = "0x00"
- register "reg_prox_ctrl19" = "0x00"
- register "reg_sar_ctrl0" = "0x50"
- register "reg_sar_ctrl1" = "0x8a"
- register "reg_sar_ctrl2" = "0x3c"
+ 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 "resolution" = "SX9310_FINEST"
+ register "avg_pos_strength" = "512"
+ register "startup_sensor" = "0"
+ register "proxraw_strength" = "0"
device i2c 28 on end
end
end
diff --git a/src/mainboard/google/volteer/variants/volteer/overridetree.cb b/src/mainboard/google/volteer/variants/volteer/overridetree.cb
index f23ef76393..10e199ae4d 100644
--- a/src/mainboard/google/volteer/variants/volteer/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/volteer/overridetree.cb
@@ -155,29 +155,15 @@ chip soc/intel/tigerlake
register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F14_IRQ)"
register "speed" = "I2C_SPEED_FAST"
register "uid" = "0"
- register "reg_prox_ctrl0" = "0x10"
- register "reg_prox_ctrl1" = "0x00"
- register "reg_prox_ctrl2" = "0x84"
- register "reg_prox_ctrl3" = "0x0e"
- register "reg_prox_ctrl4" = "0x07"
- register "reg_prox_ctrl5" = "0xc6"
- register "reg_prox_ctrl6" = "0x20"
- register "reg_prox_ctrl7" = "0x0d"
- register "reg_prox_ctrl8" = "0x8d"
- register "reg_prox_ctrl9" = "0x43"
- register "reg_prox_ctrl10" = "0x1f"
- register "reg_prox_ctrl11" = "0x00"
- register "reg_prox_ctrl12" = "0x00"
- register "reg_prox_ctrl13" = "0x00"
- register "reg_prox_ctrl14" = "0x00"
- register "reg_prox_ctrl15" = "0x00"
- register "reg_prox_ctrl16" = "0x00"
- register "reg_prox_ctrl17" = "0x00"
- register "reg_prox_ctrl18" = "0x00"
- register "reg_prox_ctrl19" = "0x00"
- register "reg_sar_ctrl0" = "0x50"
- register "reg_sar_ctrl1" = "0x8a"
- register "reg_sar_ctrl2" = "0x3c"
+ 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 "resolution" = "SX9310_FINEST"
+ register "avg_pos_strength" = "512"
+ register "startup_sensor" = "0"
+ register "proxraw_strength" = "0"
device i2c 28 on end
end
end
diff --git a/src/mainboard/google/volteer/variants/volteer2/overridetree.cb b/src/mainboard/google/volteer/variants/volteer2/overridetree.cb
index 916777c0a3..f517de246c 100644
--- a/src/mainboard/google/volteer/variants/volteer2/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/volteer2/overridetree.cb
@@ -213,29 +213,14 @@ chip soc/intel/tigerlake
register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F14_IRQ)"
register "speed" = "I2C_SPEED_FAST"
register "uid" = "0"
- register "reg_prox_ctrl0" = "0x10"
- register "reg_prox_ctrl1" = "0x00"
- register "reg_prox_ctrl2" = "0x84"
- register "reg_prox_ctrl3" = "0x0e"
- register "reg_prox_ctrl4" = "0x07"
- register "reg_prox_ctrl5" = "0xc6"
- register "reg_prox_ctrl6" = "0x20"
- register "reg_prox_ctrl7" = "0x0d"
- register "reg_prox_ctrl8" = "0x8d"
- register "reg_prox_ctrl9" = "0x43"
- register "reg_prox_ctrl10" = "0x1f"
- register "reg_prox_ctrl11" = "0x00"
- register "reg_prox_ctrl12" = "0x00"
- register "reg_prox_ctrl13" = "0x00"
- register "reg_prox_ctrl14" = "0x00"
- register "reg_prox_ctrl15" = "0x00"
- register "reg_prox_ctrl16" = "0x00"
- register "reg_prox_ctrl17" = "0x00"
- register "reg_prox_ctrl18" = "0x00"
- register "reg_prox_ctrl19" = "0x00"
- register "reg_sar_ctrl0" = "0x50"
- register "reg_sar_ctrl1" = "0x8a"
- register "reg_sar_ctrl2" = "0x3c"
+ 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 "avg_pos_strength" = "512"
+ register "startup_sensor" = "0"
+ register "proxraw_strength" = "0"
device i2c 28 on end
end
end
diff --git a/src/mainboard/google/volteer/variants/voxel/overridetree.cb b/src/mainboard/google/volteer/variants/voxel/overridetree.cb
index ed90069ab4..c1002ef752 100644
--- a/src/mainboard/google/volteer/variants/voxel/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/voxel/overridetree.cb
@@ -177,29 +177,15 @@ chip soc/intel/tigerlake
register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F14_IRQ)"
register "speed" = "I2C_SPEED_FAST"
register "uid" = "0"
- register "reg_prox_ctrl0" = "0x10"
- register "reg_prox_ctrl1" = "0x00"
- register "reg_prox_ctrl2" = "0x84"
- register "reg_prox_ctrl3" = "0x0e"
- register "reg_prox_ctrl4" = "0x07"
- register "reg_prox_ctrl5" = "0xc6"
- register "reg_prox_ctrl6" = "0x20"
- register "reg_prox_ctrl7" = "0x0d"
- register "reg_prox_ctrl8" = "0x8d"
- register "reg_prox_ctrl9" = "0x43"
- register "reg_prox_ctrl10" = "0x1f"
- register "reg_prox_ctrl11" = "0x00"
- register "reg_prox_ctrl12" = "0x00"
- register "reg_prox_ctrl13" = "0x00"
- register "reg_prox_ctrl14" = "0x00"
- register "reg_prox_ctrl15" = "0x00"
- register "reg_prox_ctrl16" = "0x00"
- register "reg_prox_ctrl17" = "0x00"
- register "reg_prox_ctrl18" = "0x00"
- register "reg_prox_ctrl19" = "0x00"
- register "reg_sar_ctrl0" = "0x50"
- register "reg_sar_ctrl1" = "0x8a"
- register "reg_sar_ctrl2" = "0x3c"
+ 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 "resolution" = "SX9310_FINEST"
+ register "avg_pos_strength" = "512"
+ register "startup_sensor" = "0"
+ register "proxraw_strength" = "0"
device i2c 28 on end
end
end