From 6220368cf138414a73e0295e591f8a13d9a97503 Mon Sep 17 00:00:00 2001 From: Aaron-Hartwig Date: Mon, 23 Jun 2025 18:47:35 -0500 Subject: [PATCH 1/3] gimlet: add missing temperature sensors for the ISL68224 controller (U352) fixes #1573 --- app/gimlet/base.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/gimlet/base.toml b/app/gimlet/base.toml index a6878740d..648c8115a 100644 --- a/app/gimlet/base.toml +++ b/app/gimlet/base.toml @@ -966,7 +966,7 @@ device = "isl68224" description = "DIMM/SP3 1.8V A0 power controller" power.rails = [ "VPP_ABCD", "VPP_EFGH", "V1P8_SP3" ] power.phases = [ [ 0 ], [ 1 ], [ 2 ] ] -sensors = { voltage = 3, current = 3 } +sensors = { temperature=3, voltage = 3, current = 3 } refdes = "U352" [[config.i2c.devices]] From 8dd9024a1af6b020ab9b860206e6c76ee83ca5d5 Mon Sep 17 00:00:00 2001 From: Aaron-Hartwig Date: Mon, 30 Jun 2025 15:25:53 -0500 Subject: [PATCH 2/3] fix toml formatting --- app/gimlet/base.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/gimlet/base.toml b/app/gimlet/base.toml index 648c8115a..312fabd72 100644 --- a/app/gimlet/base.toml +++ b/app/gimlet/base.toml @@ -966,7 +966,7 @@ device = "isl68224" description = "DIMM/SP3 1.8V A0 power controller" power.rails = [ "VPP_ABCD", "VPP_EFGH", "V1P8_SP3" ] power.phases = [ [ 0 ], [ 1 ], [ 2 ] ] -sensors = { temperature=3, voltage = 3, current = 3 } +sensors = { temperature = 3, voltage = 3, current = 3 } refdes = "U352" [[config.i2c.devices]] From f8b8110edcd2cc89d1d66ce53ecea55edf6b0f0a Mon Sep 17 00:00:00 2001 From: Aaron-Hartwig Date: Mon, 30 Jun 2025 15:26:42 -0500 Subject: [PATCH 3/3] ISL68224/RAA229618 read IC temp instead of hottest phase temp --- drv/i2c-devices/src/isl68224.rs | 2 +- drv/i2c-devices/src/raa229618.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drv/i2c-devices/src/isl68224.rs b/drv/i2c-devices/src/isl68224.rs index dbc4c9772..e8452dbfe 100644 --- a/drv/i2c-devices/src/isl68224.rs +++ b/drv/i2c-devices/src/isl68224.rs @@ -142,7 +142,7 @@ impl VoltageSensor for Isl68224 { impl TempSensor for Isl68224 { fn read_temperature(&self) -> Result { - let t = pmbus_rail_read!(self.device, self.rail, READ_TEMPERATURE_1)?; + let t = pmbus_rail_read!(self.device, self.rail, READ_TEMPERATURE_2)?; Ok(Celsius(t.get()?.0)) } } diff --git a/drv/i2c-devices/src/raa229618.rs b/drv/i2c-devices/src/raa229618.rs index adb30b491..e8e7fc226 100644 --- a/drv/i2c-devices/src/raa229618.rs +++ b/drv/i2c-devices/src/raa229618.rs @@ -173,7 +173,7 @@ impl VoltageSensor for Raa229618 { impl TempSensor for Raa229618 { fn read_temperature(&self) -> Result { - let t = pmbus_rail_read!(self.device, self.rail, READ_TEMPERATURE_1)?; + let t = pmbus_rail_read!(self.device, self.rail, READ_TEMPERATURE_2)?; Ok(Celsius(t.get()?.0)) } }