1 files changed, 20 insertions, 23 deletions

diff --git a/zephyr/projects/skyrim/adc.dts b/zephyr/projects/skyrim/adc.dts
index 40fe146a06..0f2ffd6436 100644
--- a/zephyr/projects/skyrim/adc.dts
+++ b/zephyr/projects/skyrim/adc.dts
@@ -1,4 +1,4 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
+/* Copyright 2021 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -10,63 +10,60 @@
 		compatible = "named-adc-channels";
 
 		adc_temp_charger: temp-charger {
-			label = "CHARGER";
 			enum-name = "ADC_TEMP_SENSOR_CHARGER";
 			io-channels = <&adc0 1>;
 		};
 		adc_temp_memory: temp-memory {
-			label = "MEMORY";
 			enum-name = "ADC_TEMP_SENSOR_MEMORY";
 			io-channels = <&adc0 2>;
 		};
 		adc_core_imon1: core-imon1 {
-			label = "CORE_I";
 			enum-name = "ADC_CORE_IMON1";
 			io-channels = <&adc0 3>;
 		};
 		adc_core_imon2: core-imon2 {
-			label = "SOC_I";
 			enum-name = "ADC_SOC_IMON2";
 			io-channels = <&adc0 4>;
 		};
 	};
 
+	temp_charger_thermistor: charger-thermistor {
+		compatible = "cros-ec,temp-sensor-thermistor";
+		thermistor = <&thermistor_3V3_30K9_47K_4050B>;
+		adc = <&adc_temp_charger>;
+	};
+
+	temp_memory_thermistor: memory-thermistor {
+		compatible = "cros-ec,temp-sensor-thermistor";
+		thermistor = <&thermistor_3V3_30K9_47K_4050B>;
+		adc = <&adc_temp_memory>;
+	};
+
 	named-temp-sensors {
+		compatible = "cros-ec,temp-sensors";
 		charger-thermistor {
-			compatible = "cros-ec,temp-sensor-thermistor",
-				     "cros-ec,temp-sensor";
-			thermistor = <&thermistor_3V3_30K9_47K_4050B>;
-			label = "Charger";
-			enum-name = "TEMP_SENSOR_CHARGER";
 			temp_host_high = <100>;
 			temp_host_halt = <105>;
 			temp_host_release_high = <80>;
-			adc = <&adc_temp_charger>;
+			sensor = <&temp_charger_thermistor>;
 		};
+
 		memory-thermistor {
-			compatible = "cros-ec,temp-sensor-thermistor",
-				     "cros-ec,temp-sensor";
-			thermistor = <&thermistor_3V3_30K9_47K_4050B>;
-			label = "Memory";
-			enum-name = "TEMP_SENSOR_MEMORY";
 			temp_host_high = <100>;
 			temp_host_halt = <105>;
 			temp_host_release_high = <80>;
-			adc = <&adc_temp_memory>;
 			power-good-pin = <&gpio_pg_pwr_s5>;
+			sensor = <&temp_memory_thermistor>;
 		};
-		sb-tsi-sensor {
-			compatible = "cros-ec,temp-sensor-sb-tsi",
-				     "cros-ec,temp-sensor";
-			label = "CPU";
-			enum-name = "TEMP_SENSOR_CPU";
-			port = <&i2c_soc_thermal>;
+
+		cpu {
 			temp_host_high = <100>;
 			temp_host_halt = <105>;
 			temp_host_release_high = <80>;
 			temp_fan_off = <60>;
 			temp_fan_max = <90>;
 			power-good-pin = <&gpio_s0_pgood>;
+			sensor = <&temp_cpu>;
 		};
 	};
 };