This patch updates the Catalina device tree to support different sources of PDB boards. Changes for Main source PDB board - Thermal Sensor Monitoring: - Added IOB NIC nodes (TMP421) for thermal sensor monitoring. - Added FIO remote thermal node (TMP75) for thermal sensor monitoring. - Fan Monitoring and Control: - Add fan p12V power sensor node (MP5990) for sensor monitoring. - Add fan controllers (MAX31790) for fan control and tach monitoring. Changes for 2nd source PDB board - Fan Monitoring and Control: - Added 2nd source fan controllers (NCT7363) for fan duty control and tach monitoring. - Power Monitoring: - Added 2nd source HSC nodes (XDP710) for power sensor monitoring. - Address Conflicts: - Removed all ina238 nodes due to address conflicts. Moved the driver probe for ina238 to userspace. Changes for PDB brick board - Power Monitoring: - Add delta brick nodes for power sensor monitoring. Signed-off-by: Potin Lai <potin.lai.pt@xxxxxxxxx> --- Updating the Catalina DTS to support multiple PDB board sources. --- Changes in v2: - Add delta_brick nodes to support PDB brick board - Link to v1: https://lore.kernel.org/r/20250103-potin-catalina-dts-update-20250102-v1-1-b0b7a523c968@xxxxxxxxx --- .../dts/aspeed/aspeed-bmc-facebook-catalina.dts | 170 ++++++++++++++++++--- 1 file changed, 147 insertions(+), 23 deletions(-) diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts index 3822bb3c9243..49230e6a749e 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts @@ -190,6 +190,12 @@ i2c0mux0ch0: i2c@0 { #address-cells = <1>; #size-cells = <0>; reg = <0>; + + // IOB0 NIC0 TEMP + temperature-sensor@1f { + compatible = "ti,tmp421"; + reg = <0x1f>; + }; }; i2c0mux0ch1: i2c@1 { #address-cells = <1>; @@ -200,6 +206,12 @@ i2c0mux0ch2: i2c@2 { #address-cells = <1>; #size-cells = <0>; reg = <2>; + + // IOB0 NIC1 TEMP + temperature-sensor@1f { + compatible = "ti,tmp421"; + reg = <0x1f>; + }; }; i2c0mux0ch3: i2c@3 { #address-cells = <1>; @@ -361,6 +373,12 @@ i2c0mux3ch0: i2c@0 { #address-cells = <1>; #size-cells = <0>; reg = <0>; + + // IOB1 NIC0 TEMP + temperature-sensor@1f { + compatible = "ti,tmp421"; + reg = <0x1f>; + }; }; i2c0mux3ch1: i2c@1 { #address-cells = <1>; @@ -371,6 +389,12 @@ i2c0mux3ch2: i2c@2 { #address-cells = <1>; #size-cells = <0>; reg = <2>; + + // IOB1 NIC1 TEMP + temperature-sensor@1f { + compatible = "ti,tmp421"; + reg = <0x1f>; + }; }; i2c0mux3ch3: i2c@3 { #address-cells = <1>; @@ -464,51 +488,145 @@ i2c1mux0ch0: i2c@0 { #size-cells = <0>; reg = <0x0>; - power-sensor@41 { - compatible = "ti,ina238"; - reg = <0x41>; - shunt-resistor = <500>; - }; - power-sensor@42 { - compatible = "ti,ina238"; - reg = <0x42>; - shunt-resistor = <500>; - }; - power-sensor@44 { - compatible = "ti,ina238"; - reg = <0x44>; - shunt-resistor = <500>; + power-sensor@22 { + compatible = "mps,mp5990"; + reg = <0x22>; }; }; i2c1mux0ch1: i2c@1 { #address-cells = <1>; #size-cells = <0>; reg = <0x1>; - - power-sensor@41 { - compatible = "ti,ina238"; - reg = <0x41>; - }; - power-sensor@43 { - compatible = "ti,ina238"; - reg = <0x43>; - }; }; i2c1mux0ch2: i2c@2 { #address-cells = <1>; #size-cells = <0>; reg = <0x2>; + + hwmon0: hwmon@1 { + compatible = "nuvoton,nct7363"; + reg = <0x01>; + #pwm-cells = <2>; + + fan-9 { + pwms = <&hwmon0 0 40000>; + tach-ch = /bits/ 8 <0x09>; + }; + fan-11 { + pwms = <&hwmon0 0 40000>; + tach-ch = /bits/ 8 <0x0b>; + }; + fan-10 { + pwms = <&hwmon0 4 40000>; + tach-ch = /bits/ 8 <0x0a>; + }; + fan-13 { + pwms = <&hwmon0 4 40000>; + tach-ch = /bits/ 8 <0x0d>; + }; + fan-15 { + pwms = <&hwmon0 6 40000>; + tach-ch = /bits/ 8 <0x0f>; + }; + fan-1 { + pwms = <&hwmon0 6 40000>; + tach-ch = /bits/ 8 <0x01>; + }; + fan-0 { + pwms = <&hwmon0 10 40000>; + tach-ch = /bits/ 8 <0x00>; + }; + fan-3 { + pwms = <&hwmon0 10 40000>; + tach-ch = /bits/ 8 <0x03>; + }; + }; + hwmon1: hwmon@2 { + compatible = "nuvoton,nct7363"; + reg = <0x02>; + #pwm-cells = <2>; + + fan-9 { + pwms = <&hwmon1 0 40000>; + tach-ch = /bits/ 8 <0x09>; + }; + fan-11 { + pwms = <&hwmon1 0 40000>; + tach-ch = /bits/ 8 <0x0b>; + }; + fan-10 { + pwms = <&hwmon1 4 40000>; + tach-ch = /bits/ 8 <0x0a>; + }; + fan-13 { + pwms = <&hwmon1 4 40000>; + tach-ch = /bits/ 8 <0x0d>; + }; + fan-15 { + pwms = <&hwmon1 6 40000>; + tach-ch = /bits/ 8 <0x0f>; + }; + fan-1 { + pwms = <&hwmon1 6 40000>; + tach-ch = /bits/ 8 <0x01>; + }; + fan-0 { + pwms = <&hwmon1 10 40000>; + tach-ch = /bits/ 8 <0x00>; + }; + fan-3 { + pwms = <&hwmon1 10 40000>; + tach-ch = /bits/ 8 <0x03>; + }; + }; + pwm@21{ + compatible = "maxim,max31790"; + reg = <0x21>; + }; + pwm@27{ + compatible = "maxim,max31790"; + reg = <0x27>; + }; }; i2c1mux0ch3: i2c@3 { #address-cells = <1>; #size-cells = <0>; reg = <0x3>; + + delta_brick@63 { + compatible = "pmbus"; + reg = <0x63>; + }; + delta_brick@64 { + compatible = "pmbus"; + reg = <0x64>; + }; + delta_brick@65 { + compatible = "pmbus"; + reg = <0x65>; + }; + delta_brick@66 { + compatible = "pmbus"; + reg = <0x66>; + }; + delta_brick@67 { + compatible = "pmbus"; + reg = <0x67>; + }; }; i2c1mux0ch4: i2c@4 { #address-cells = <1>; #size-cells = <0>; reg = <0x4>; + power-monitor@13 { + compatible = "infineon,xdp710"; + reg = <0x13>; + }; + power-monitor@1c { + compatible = "infineon,xdp710"; + reg = <0x1c>; + }; power-monitor@42 { compatible = "lltc,ltc4287"; reg = <0x42>; @@ -580,6 +698,12 @@ temperature-sensor@4b { compatible = "ti,tmp75"; reg = <0x4b>; }; + + // FIO REMOTE TEMP SENSOR + temperature-sensor@4f { + compatible = "ti,tmp75"; + reg = <0x4f>; + }; }; }; }; --- base-commit: becaccc292bfbd12df81148746043c5221e49da8 change-id: 20250102-potin-catalina-dts-update-20250102-914b06a4bdba Best regards, -- Potin Lai <potin.lai.pt@xxxxxxxxx>