Skyrim: Configure temperature sensors for first boards

Skyrim is using the PCT2075 rather than the TMP112, and disable the
SB-TSI sensor for the first boards.

BRANCH=None
BUG=b:208515128
TEST=zmake testall

Signed-off-by: Diana Z <dzigterman@chromium.org>
Change-Id: Ie96067d7be7f5fd693b20d45fd7092d16c387ee2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3390526
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>

6 files changed, 58 insertions, 22 deletions

diff --git a/zephyr/projects/skyrim/adc.dts b/zephyr/projects/skyrim/adc.dts
index c7c7482ee2..05ceb0bdb2 100644
--- a/zephyr/projects/skyrim/adc.dts
+++ b/zephyr/projects/skyrim/adc.dts
@@ -32,19 +32,6 @@
 	};
 
 	named-temp-sensors {
-		soc-tmp112 {
-			compatible = "cros-ec,temp-sensor-tmp112";
-			label = "SOC";
-			enum-name = "TEMP_SENSOR_SOC";
-			tmp112-name = "TMP112_SOC";
-			port = <&i2c_sensor>;
-			i2c-addr-flags = "TMP112_I2C_ADDR_FLAGS0";
-			temp_host_high = <100>;
-			temp_host_halt = <105>;
-			temp_host_release_high = <80>;
-			temp_fan_off = <0>;
-			temp_fan_max = <70>;
-		};
 		charger-thermistor {
 			compatible = "cros-ec,temp-sensor-thermistor";
 			thermistor = <&thermistor_3V3_30K9_47K_4050B>;
@@ -76,14 +63,6 @@
 			temp_fan_off = <60>;
 			temp_fan_max = <90>;
 		};
-		amb-tmp112 {
-			compatible = "cros-ec,temp-sensor-tmp112";
-			label = "Ambient";
-			enum-name = "TEMP_SENSOR_AMB";
-			tmp112-name = "TMP112_AMB";
-			port = <&i2c_sensor>;
-			i2c-addr-flags = "TMP112_I2C_ADDR_FLAGS1";
-		};
 	};
 };
 
diff --git a/zephyr/projects/skyrim/guybrush.dts b/zephyr/projects/skyrim/guybrush.dts
index 5c7d86c95f..63ecda8534 100644
--- a/zephyr/projects/skyrim/guybrush.dts
+++ b/zephyr/projects/skyrim/guybrush.dts
@@ -108,4 +108,28 @@
 			io-channels = <&adc0 0>;
 		};
 	};
+
+	named-temp-sensors {
+		soc-tmp112 {
+			compatible = "cros-ec,temp-sensor-tmp112";
+			label = "SOC";
+			enum-name = "TEMP_SENSOR_SOC";
+			tmp112-name = "TMP112_SOC";
+			port = <&i2c_sensor>;
+			i2c-addr-flags = "TMP112_I2C_ADDR_FLAGS0";
+			temp_host_high = <100>;
+			temp_host_halt = <105>;
+			temp_host_release_high = <80>;
+			temp_fan_off = <0>;
+			temp_fan_max = <70>;
+		};
+		amb-tmp112 {
+			compatible = "cros-ec,temp-sensor-tmp112";
+			label = "Ambient";
+			enum-name = "TEMP_SENSOR_AMB";
+			tmp112-name = "TMP112_AMB";
+			port = <&i2c_sensor>;
+			i2c-addr-flags = "TMP112_I2C_ADDR_FLAGS1";
+		};
+	};
 };
diff --git a/zephyr/projects/skyrim/prj.conf b/zephyr/projects/skyrim/prj.conf
index d2681cb3ee..807700070d 100644
--- a/zephyr/projects/skyrim/prj.conf
+++ b/zephyr/projects/skyrim/prj.conf
@@ -36,7 +36,6 @@ CONFIG_PLATFORM_EC_CBI_EEPROM=y
 # Temperature Sensors
 CONFIG_PLATFORM_EC_TEMP_SENSOR=y
 CONFIG_PLATFORM_EC_TEMP_SENSOR_SB_TSI=y
-CONFIG_PLATFORM_EC_TEMP_SENSOR_TMP112=y
 CONFIG_PLATFORM_EC_THERMISTOR=y
 CONFIG_PLATFORM_EC_THROTTLE_AP=y
 
diff --git a/zephyr/projects/skyrim/prj_guybrush.conf b/zephyr/projects/skyrim/prj_guybrush.conf
index fb82542eee..f1ef2ae811 100644
--- a/zephyr/projects/skyrim/prj_guybrush.conf
+++ b/zephyr/projects/skyrim/prj_guybrush.conf
@@ -4,3 +4,6 @@
 
 # Guybrush board-specific Kconfig settings.
 CONFIG_BOARD_GUYBRUSH=y
+
+# Only Guybrush has TMP112
+CONFIG_PLATFORM_EC_TEMP_SENSOR_TMP112=y
diff --git a/zephyr/projects/skyrim/prj_skyrim.conf b/zephyr/projects/skyrim/prj_skyrim.conf
index a4da8a0562..a44046089e 100644
--- a/zephyr/projects/skyrim/prj_skyrim.conf
+++ b/zephyr/projects/skyrim/prj_skyrim.conf
@@ -4,3 +4,6 @@
 
 # Skyrim reference-board-specific Kconfig settings.
 CONFIG_BOARD_SKYRIM=y
+
+# Only Skyrim has the PCT2075
+CONFIG_PLATFORM_EC_TEMP_SENSOR_PCT2075=y
diff --git a/zephyr/projects/skyrim/skyrim.dts b/zephyr/projects/skyrim/skyrim.dts
index c55c57a655..3bda3e7fbc 100644
--- a/zephyr/projects/skyrim/skyrim.dts
+++ b/zephyr/projects/skyrim/skyrim.dts
@@ -102,4 +102,32 @@
 		lvol-io-pads = <&lvol_io92 &lvol_io91 &lvol_ioe4 &lvol_ioe3
 				&lvol_iob3 &lvol_iob2 &lvol_io50>;
 	};
+
+	named-temp-sensors {
+		soc-pct2075 {
+			compatible = "cros-ec,temp-sensor-pct2075";
+			label = "SOC";
+			enum-name = "TEMP_SENSOR_SOC";
+			pct2075-name = "PCT2075_SOC";
+			port = <&i2c_sensor>;
+			i2c-addr-flags = "PCT2075_I2C_ADDR_FLAGS0";
+			temp_host_high = <100>;
+			temp_host_halt = <105>;
+			temp_host_release_high = <80>;
+			temp_fan_off = <0>;
+			temp_fan_max = <70>;
+		};
+		amb-pct2075 {
+			compatible = "cros-ec,temp-sensor-pct2075";
+			label = "Ambient";
+			enum-name = "TEMP_SENSOR_AMB";
+			pct2075-name = "PCT2075_AMB";
+			port = <&i2c_sensor>;
+			i2c-addr-flags = "PCT2075_I2C_ADDR_FLAGS7";
+		};
+		/* Disable SB TSI for first board revision */
+		sb-tsi-sensor {
+			status = "disabled";
+		};
+	};
 };