[PATCH v5 6/6] ARM: dts: aspeed: Fix max31785 fan node naming

[Eddie James]

Now that the max31785 is properly documented, fix up the uses of
it in the Aspeed dts.

Signed-off-by: Eddie James <eajames at linux.ibm.com>
---
 .../arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts |  6 ++----
 .../arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts | 10 ++++------
 arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-fuji.dts   |  2 --
 .../arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts | 14 ++++++--------
 arch/arm/boot/dts/aspeed/aspeed-bmc-opp-tacoma.dts | 10 ++++------
 .../boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts |  2 --
 6 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts
index 2f5d4075a64ad..36e6bbfdeb30a 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts
@@ -273,16 +273,14 @@ eeprom at 51 {
 	max31785 at 52 {
 		compatible = "maxim,max31785a";
 		reg = <0x52>;
-		#address-cells = <1>;
-		#size-cells = <0>;
 
-		fan0: fan at 0 {
+		fan0: fan-0 {
 			compatible = "pmbus-fan";
 			reg = <0>;
 			tach-pulses = <2>;
 		};
 
-		fan1: fan at 1 {
+		fan1: fan-1 {
 			compatible = "pmbus-fan";
 			reg = <1>;
 			tach-pulses = <2>;
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
index 9f144f527f03b..db20a3b740836 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
@@ -2061,29 +2061,27 @@ i2c14mux0chn3: i2c at 3 {
 
 			max31785 at 52 {
 				compatible = "maxim,max31785a";
-				#address-cells = <1>;
-				#size-cells = <0>;
 				reg = <0x52>;
 
-				fan at 0 {
+				fan-0 {
 					compatible = "pmbus-fan";
 					reg = <0>;
 					tach-pulses = <2>;
 				};
 
-				fan at 1 {
+				fan-1 {
 					compatible = "pmbus-fan";
 					reg = <1>;
 					tach-pulses = <2>;
 				};
 
-				fan at 2 {
+				fan-2 {
 					compatible = "pmbus-fan";
 					reg = <2>;
 					tach-pulses = <2>;
 				};
 
-				fan at 3 {
+				fan-3 {
 					compatible = "pmbus-fan";
 					reg = <3>;
 					tach-pulses = <2>;
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-fuji.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-fuji.dts
index 9a43fc7bcebe9..e312bfc2c5bda 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-fuji.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-fuji.dts
@@ -2053,8 +2053,6 @@ i2c14mux0chn3: i2c at 3 {
 			pwm at 52 {
 				compatible = "maxim,max31785a";
 				reg = <0x52>;
-				#address-cells = <1>;
-				#size-cells = <0>;
 			};
 
 			led-controller at 60 {
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts
index c5fb5d410001b..8a5f4131787f1 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts
@@ -1076,40 +1076,38 @@ tmp275 at 48 {
 	max: max31785 at 52 {
 		compatible = "maxim,max31785a";
 		reg = <0x52>;
-		#address-cells = <1>;
-		#size-cells = <0>;
 
-		fan0: fan at 0 {
+		fan0: fan-0 {
 			compatible = "pmbus-fan";
 			reg = <0>;
 			tach-pulses = <2>;
 		};
 
-		fan1: fan at 1 {
+		fan1: fan-1 {
 			compatible = "pmbus-fan";
 			reg = <1>;
 			tach-pulses = <2>;
 		};
 
-		fan2: fan at 2 {
+		fan2: fan-2 {
 			compatible = "pmbus-fan";
 			reg = <2>;
 			tach-pulses = <2>;
 		};
 
-		fan3: fan at 3 {
+		fan3: fan-3 {
 			compatible = "pmbus-fan";
 			reg = <3>;
 			tach-pulses = <2>;
 		};
 
-		fan4: fan at 4 {
+		fan4: fan-4 {
 			compatible = "pmbus-fan";
 			reg = <4>;
 			tach-pulses = <2>;
 		};
 
-		fan5: fan at 5 {
+		fan5: fan-5 {
 			compatible = "pmbus-fan";
 			reg = <5>;
 			tach-pulses = <2>;
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-tacoma.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-tacoma.dts
index b31eb8e58c6b4..bc83605bdf497 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-tacoma.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-tacoma.dts
@@ -477,10 +477,8 @@ bmp: bmp280 at 77 {
 	max31785 at 52 {
 		compatible = "maxim,max31785a";
 		reg = <0x52>;
-		#address-cells = <1>;
-		#size-cells = <0>;
 
-		fan at 0 {
+		fan-0 {
 			compatible = "pmbus-fan";
 			reg = <0>;
 			tach-pulses = <2>;
@@ -493,7 +491,7 @@ fan at 0 {
 			maxim,fan-fault-pin-mon;
 		};
 
-		fan at 1 {
+		fan-1 {
 			compatible = "pmbus-fan";
 			reg = <1>;
 			tach-pulses = <2>;
@@ -506,7 +504,7 @@ fan at 1 {
 			maxim,fan-fault-pin-mon;
 		};
 
-		fan at 2 {
+		fan-2 {
 			compatible = "pmbus-fan";
 			reg = <2>;
 			tach-pulses = <2>;
@@ -519,7 +517,7 @@ fan at 2 {
 			maxim,fan-fault-pin-mon;
 		};
 
-		fan at 3 {
+		fan-3 {
 			compatible = "pmbus-fan";
 			reg = <3>;
 			tach-pulses = <2>;
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts
index 89907b628b655..f26df3c8cc261 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts
@@ -360,8 +360,6 @@ bmp: bmp280 at 77 {
 	max31785 at 52 {
 		compatible = "maxim,max31785a";
 		reg = <0x52>;
-		#address-cells = <1>;
-		#size-cells = <0>;
 	};
 
 	dps: dps310 at 76 {
-- 
2.51.0