arm64: dts: apple: Adjust all hwmon sensors for upstream driver

Signed-off-by: Janne Grunau <j@jannau.net>

Author: jannau

arch/arm64/boot/dts/apple/hwmon-common.dtsi

@@ -5,39 +5,29 @@
  * Copyright The Asahi Linux Contributors
  */
 
-&smc {
-	hwmon {
-		apple,power-keys {
-			power-PSTR {
-				apple,key-id = "PSTR";
-				label = "Total System Power";
-			};
-			power-PDTR {
-				apple,key-id = "PDTR";
-				label = "AC Input Power";
-			};
-			power-PMVR {
-				apple,key-id = "PMVR";
-				label = "3.8 V Rail Power";
-			};
-		};
-		apple,temp-keys {
-			temp-TH0x {
-				apple,key-id = "TH0x";
-				label = "NAND Flash Temperature";
-			};
-		};
-		apple,volt-keys {
-			volt-VD0R {
-				apple,key-id = "VD0R";
-				label = "AC Input Voltage";
-			};
-		};
-		apple,current-keys {
-			current-ID0R {
-				apple,key-id = "ID0R";
-				label = "AC Input Current";
-			};
-		};
+&smc_hwmon {
+	power-PSTR {
+		apple,key-id = "PSTR";
+		label = "Total System Power";
+	};
+	power-PDTR {
+		apple,key-id = "PDTR";
+		label = "AC Input Power";
+	};
+	power-PMVR {
+		apple,key-id = "PMVR";
+		label = "3.8 V Rail Power";
+	};
+	temperature-TH0x {
+		apple,key-id = "TH0x";
+		label = "NAND Flash Temperature";
+	};
+	voltage-VD0R {
+		apple,key-id = "VD0R";
+		label = "AC Input Voltage";
+	};
+	current-ID0R {
+		apple,key-id = "ID0R";
+		label = "AC Input Current";
 	};
 };

arch/arm64/boot/dts/apple/hwmon-fan-dual.dtsi

@@ -7,20 +7,16 @@
 
 #include "hwmon-fan.dtsi"
 
-&smc {
-	hwmon {
-		apple,fan-keys {
-			fan-F0Ac {
-				label = "Fan 1";
-			};
-			fan-F1Ac {
-				apple,key-id = "F1Ac";
-				label = "Fan 2";
-				apple,fan-minimum = "F1Mn";
-				apple,fan-maximum = "F1Mx";
-				apple,fan-target = "F1Tg";
-				apple,fan-mode = "F1Md";
-			};
-		};
+&smc_hwmon {
+	fan-F0Ac {
+		label = "Fan 1";
+	};
+	fan-F1Ac {
+		apple,key-id = "F1Ac";
+		label = "Fan 2";
+		apple,fan-minimum = "F1Mn";
+		apple,fan-maximum = "F1Mx";
+		apple,fan-target = "F1Tg";
+		apple,fan-mode = "F1Md";
 	};
 };

arch/arm64/boot/dts/apple/hwmon-fan.dtsi

@@ -5,17 +5,13 @@
  * Fan hwmon sensors for machines with a single fan.
  */
 
-&smc {
-	hwmon {
-		apple,fan-keys {
-			fan-F0Ac {
-				apple,key-id = "F0Ac";
-				label = "Fan";
-				apple,fan-minimum = "F0Mn";
-				apple,fan-maximum = "F0Mx";
-				apple,fan-target = "F0Tg";
-				apple,fan-mode = "F0Md";
-			};
-		};
+&smc_hwmon {
+	fan-F0Ac {
+		apple,key-id = "F0Ac";
+		label = "Fan";
+		apple,fan-minimum = "F0Mn";
+		apple,fan-maximum = "F0Mx";
+		apple,fan-target = "F0Tg";
+		apple,fan-mode = "F0Md";
 	};
 };

arch/arm64/boot/dts/apple/hwmon-laptop.dtsi

@@ -5,37 +5,29 @@
  * Copyright The Asahi Linux Contributors
  */
 
-&smc {
-	hwmon {
-		apple,power-keys {
-			power-PHPC {
-				apple,key-id = "PHPC";
-				label = "Heatpipe Power";
-			};
-		};
-		apple,temp-keys {
-			temp-TB0T {
-				apple,key-id = "TB0T";
-				label = "Battery Hotspot";
-			};
-			temp-TCHP {
-				apple,key-id = "TCHP";
-				label = "Charge Regulator Temp";
-			};
-			temp-TW0P {
-				apple,key-id = "TW0P";
-				label = "WiFi/BT Module Temp";
-			};
-		};
-		apple,volt-keys {
-			volt-SBAV {
-				apple,key-id = "SBAV";
-				label = "Battery Voltage";
-			};
-			volt-VD0R {
-				apple,key-id = "VD0R";
-				label = "Charger Input Voltage";
-			};
-		};
+&smc_hwmon {
+	power-PHPC {
+		apple,key-id = "PHPC";
+		label = "Heatpipe Power";
+	};
+	temperature-TB0T {
+		apple,key-id = "TB0T";
+		label = "Battery Hotspot";
+	};
+	temperature-TCHP {
+		apple,key-id = "TCHP";
+		label = "Charge Regulator Temp";
+	};
+	temperature-TW0P {
+		apple,key-id = "TW0P";
+		label = "WiFi/BT Module Temp";
+	};
+	voltage-SBAV {
+		apple,key-id = "SBAV";
+		label = "Battery Voltage";
+	};
+	voltage-VD0R {
+		apple,key-id = "VD0R";
+		label = "Charger Input Voltage";
 	};
 };

arch/arm64/boot/dts/apple/hwmon-mini.dtsi

@@ -8,13 +8,9 @@
 
 #include "hwmon-fan.dtsi"
 
-&smc {
-	hwmon {
-		apple,temp-keys {
-			temp-TW0P {
-				apple,key-id = "TW0P";
-				label = "WiFi/BT Module Temp";
-			};
-		};
+&smc_hwmon {
+	temperature-TW0P {
+		apple,key-id = "TW0P";
+		label = "WiFi/BT Module Temp";
 	};
 };