Merge pull request #716 from FrameworkComputer/lotus.thermal_sensor_wrong_idx

Fix wrong F75303 index and STT index

Author: kiram9

zephyr/program/lotus/CMakeLists.txt

@@ -19,8 +19,6 @@ zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_LED_COMMON
 	"src/led_pwm.c")
 zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_LED_COMMON
 	"src/led.c")
-zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_AMD_STT
-	"src/stt.c")
 
 if(DEFINED CONFIG_BOARD_LOTUS)
 	project(lotus)
@@ -39,6 +37,9 @@ if(DEFINED CONFIG_BOARD_LOTUS)
 			"lotus/src/amd_r23m.c"
 			"lotus/src/ej889i.c"
 	)
+	zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_AMD_STT
+	"lotus/src/stt.c")
+
 endif()
 if(DEFINED CONFIG_BOARD_AZALEA)
 	project(azalea)
@@ -53,4 +54,7 @@ if(DEFINED CONFIG_BOARD_AZALEA)
 			"azalea/src/project_diagnostics.c"
 			"azalea/src/power_button_x86.c"
 	)
+	zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_AMD_STT
+	"azalea/src/stt.c")
+
 endif()

zephyr/program/lotus/src/stt.c zephyr/program/lotus/azalea/src/stt.czephyr/program/lotus/src/stt.c renamed to zephyr/program/lotus/azalea/src/stt.c

@@ -193,21 +193,21 @@
 	pinctrl-names = "default";
 
 	/* TODO: Add the device on this bus */
-	local_f75303: local_f75303@4d {
+	ambient_f75303: ambient_f75303@4d {
 		compatible = "cros-ec,temp-sensor-f75303";
 		temperature-type = "F75303_IDX_LOCAL";
 		reg = <0x4d>;
 	};
 
-	ddr_f75303: ddr_f75303@4d {
+	charger_f75303: charger_f75303@4d {
 		compatible = "cros-ec,temp-sensor-f75303";
-		temperature-type = "F75303_IDX_REMOTE1";
+		temperature-type = "F75303_IDX_REMOTE2";
 		reg = <0x4d>;
 	};
 
-	cpu_f75303: cpu_f75303@4d {
+	apu_f75303: apu_f75303@4d {
 		compatible = "cros-ec,temp-sensor-f75303";
-		temperature-type = "F75303_IDX_REMOTE2";
+		temperature-type = "F75303_IDX_REMOTE1";
 		reg = <0x4d>;
 	};
 

zephyr/program/lotus/lotus/i2c.dtsi

@@ -10,7 +10,7 @@
 
 	named-temp-sensors {
 		compatible = "cros-ec,temp-sensors";
-		local-f75303 {
+		ambient-f75303 {
 			temp_host_warn = <90>;
 			temp_host_high = <90>;
 			temp_host_halt = <105>;
@@ -19,9 +19,9 @@
 			temp_fan_off = <45>;
 			temp_fan_max = <60>;
 			power-good-pin = <&gpio_slp_s3_l>;
-			sensor = <&local_f75303>;
+			sensor = <&ambient_f75303>;
 		};
-		ddr-f75303 {
+		charger-f75303 {
 			temp_host_warn = <90>;
 			temp_host_high = <90>;
 			temp_host_halt = <105>;
@@ -30,9 +30,9 @@
 			temp_fan_off = <45>;
 			temp_fan_max = <60>;
 			power-good-pin = <&gpio_slp_s3_l>;
-			sensor = <&ddr_f75303>;
+			sensor = <&charger_f75303>;
 		};
-		cpu-f75303 {
+		apu-f75303 {
 			temp_host_warn = <90>;
 			temp_host_high = <90>;
 			temp_host_halt = <105>;
@@ -41,7 +41,7 @@
 			temp_fan_off = <45>;
 			temp_fan_max = <62>;
 			power-good-pin = <&gpio_slp_s3_l>;
-			sensor = <&cpu_f75303>;
+			sensor = <&apu_f75303>;
 		};
 		amd-apu {
 			temp_host_warn = <108>;

zephyr/program/lotus/lotus/overlay.dtsi

@@ -77,15 +77,15 @@ void f75303_update_temperature(int idx)
 	if (idx >= F75303_IDX_COUNT)
 		return;
 	switch (idx) {
-	/* local_f75303 */
+	/* ambient_f75303 */
 	case 0:
 		rv = get_temp(idx, F75303_TEMP_LOCAL_REGISTER, &temp_reg);
 		break;
-	/* ddr_f75303 */
+	/* apu_f75303 */
 	case 1:
 		rv = get_temp(idx, F75303_TEMP_REMOTE1_REGISTER, &temp_reg);
 		break;
-	/* cpu_f75303 */
+	/* charger_f75303 */
 	case 2:
 		rv = get_temp(idx, F75303_TEMP_REMOTE2_REGISTER, &temp_reg);
 		break;

zephyr/program/lotus/lotus/src/f75303.c

@@ -0,0 +1,29 @@
+/* Copyright 2022 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* Support code for STT temperature reporting */
+
+#include "chipset.h"
+#include "temp_sensor/f75303.h"
+#include "temp_sensor/pct2075.h"
+#include "temp_sensor/temp_sensor.h"
+
+int board_get_soc_temp_mk(int *temp_mk)
+{
+	if (chipset_in_state(CHIPSET_STATE_HARD_OFF))
+		return EC_ERROR_NOT_POWERED;
+
+	return f75303_get_val_mk(F75303_SENSOR_ID(DT_NODELABEL(apu_f75303)),
+				 temp_mk);
+}
+
+int board_get_ambient_temp_mk(int *temp_mk)
+{
+	if (chipset_in_state(CHIPSET_STATE_HARD_OFF))
+		return EC_ERROR_NOT_POWERED;
+
+	return f75303_get_val_mk(
+		F75303_SENSOR_ID(DT_NODELABEL(ambient_f75303)), temp_mk);
+}