Skip to content

Commit

Permalink
[Mellanox]Fix error in sensors.conf for 3700/3700c/3800
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephen Sun committed Apr 28, 2020
1 parent 87f2dbd commit d15d9f9
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 44 deletions.
30 changes: 17 additions & 13 deletions device/mellanox/x86_64-mlnx_msn3700-r0/sensors.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,22 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)"
# Power controllers
bus "i2c-5" "i2c-1-mux (chan_id 4)"
chip "tps53679-i2c-*-70"
label in1 "PMIC-1 PSU 12V Rail (in)"
label in2 "PMIC-1 ASIC 0.8V VCORE Rail (out)"
label in3 "PMIC-1 ASIC 1.2V Rail (out)"
label in1 "PMIC-1 PSU 12V Rail (in1)"
label in2 "PMIC-1 PSU 12V Rail (in2)"
label in3 "PMIC-1 ASIC 0.8V VCORE Rail (out)"
label in4 "PMIC-1 ASIC 1.2V Rail (out)"
label temp1 "PMIC-1 Temp 1"
label temp2 "PMIC-1 Temp 2"
label power1 "PMIC-1 ASIC 0.8V VCORE Rail Pwr (out)"
label power2 "PMIC-1 ASIC 1.2V Rail Pwr (out)"
label curr1 "PMIC-1 ASIC 0.8V VCORE Rail Curr (out)"
label curr2 "PMIC-1 ASIC 1.2V Rail Curr (out)"
chip "tps53679-i2c-*-71"
label in1 "PMIC-2 PSU 12V Rail (in)"
label in2 "PMIC-2 ASIC 3.3V Rail (out)"
compute in2 (1.5)*@, @/(1.5)
label in3 "PMIC-2 ASIC 1.8V Rail (out)"
label in1 "PMIC-2 PSU 12V Rail (in1)"
label in2 "PMIC-2 PSU 12V Rail (in2)"
label in3 "PMIC-2 ASIC 3.3V Rail (out)"
compute in3 (1.5)*@, @/(1.5)
label in4 "PMIC-2 ASIC 1.8V Rail (out)"
label temp1 "PMIC-2 Temp 1"
label temp2 "PMIC-2 Temp 2"
label power1 "PMIC-2 ASIC 3.3V Rail Pwr (out)"
Expand All @@ -45,19 +47,21 @@ bus "i2c-5" "i2c-1-mux (chan_id 4)"

bus "i2c-15" "i2c-1-mux (chan_id 6)"
chip "tps53679-i2c-*-58"
label in1 "PMIC-3 PSU 12V Rail (in)"
label in2 "PMIC-3 COMEX 1.8V Rail (out)"
label in3 "PMIC-3 COMEX 1.05V Rail (out)"
label in1 "PMIC-3 PSU 12V Rail (in1)"
label in2 "PMIC-3 PSU 12V Rail (in2)"
label in3 "PMIC-3 COMEX 1.8V Rail (out)"
label in4 "PMIC-3 COMEX 1.05V Rail (out)"
label temp1 "PMIC-3 Temp 1"
label temp2 "PMIC-3 Temp 2"
label power1 "PMIC-3 COMEX 1.8V Rail Pwr (out)"
label power2 "PMIC-3 COMEX 1.05V Rail Pwr (out)"
label curr1 "PMIC-3 COMEX 1.8V Rail Curr (out)"
label curr2 "PMIC-3 COMEX 1.05V Rail Curr (out)"
chip "tps53679-i2c-*-61"
label in1 "PMIC-4 PSU 12V Rail (in)"
label in2 "PMIC-4 COMEX 1.2V Rail (out)"
ignore in3
label in1 "PMIC-4 PSU 12V Rail (in1)"
label in2 "PMIC-4 PSU 12V Rail (in2)"
label in3 "PMIC-4 COMEX 1.2V Rail (out)"
ignore in4
label temp1 "PMIC-4 Temp 1"
label temp2 "PMIC-4 Temp 2"
label power1 "PMIC-4 COMEX 1.2V Rail Pwr (out)"
Expand Down
30 changes: 17 additions & 13 deletions device/mellanox/x86_64-mlnx_msn3700c-r0/sensors.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,22 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)"
# Power controllers
bus "i2c-5" "i2c-1-mux (chan_id 4)"
chip "tps53679-i2c-*-70"
label in1 "PMIC-1 PSU 12V Rail (in)"
label in2 "PMIC-1 ASIC 0.8V VCORE Rail (out)"
label in3 "PMIC-1 ASIC 1.2V Rail (out)"
label in1 "PMIC-1 PSU 12V Rail (in1)"
label in2 "PMIC-1 PSU 12V Rail (in2)"
label in3 "PMIC-1 ASIC 0.8V VCORE Rail (out)"
label in4 "PMIC-1 ASIC 1.2V Rail (out)"
label temp1 "PMIC-1 Temp 1"
label temp2 "PMIC-1 Temp 2"
label power1 "PMIC-1 ASIC 0.8V VCORE Rail Pwr (out)"
label power2 "PMIC-1 ASIC 1.2V Rail Pwr (out)"
label curr1 "PMIC-1 ASIC 0.8V VCORE Rail Curr (out)"
label curr2 "PMIC-1 ASIC 1.2V Rail Curr (out)"
chip "tps53679-i2c-*-71"
label in1 "PMIC-2 PSU 12V Rail (in)"
label in2 "PMIC-2 ASIC 3.3V Rail (out)"
compute in2 (1.5)*@, @/(1.5)
label in3 "PMIC-2 ASIC 1.8V Rail (out)"
label in1 "PMIC-2 PSU 12V Rail (in1)"
label in2 "PMIC-2 PSU 12V Rail (in2)"
label in3 "PMIC-2 ASIC 3.3V Rail (out)"
compute in3 (1.5)*@, @/(1.5)
label in4 "PMIC-2 ASIC 1.8V Rail (out)"
label temp1 "PMIC-2 Temp 1"
label temp2 "PMIC-2 Temp 2"
label power1 "PMIC-2 ASIC 3.3V Rail Pwr (out)"
Expand All @@ -45,19 +47,21 @@ bus "i2c-5" "i2c-1-mux (chan_id 4)"

bus "i2c-15" "i2c-1-mux (chan_id 6)"
chip "tps53679-i2c-*-58"
label in1 "PMIC-3 PSU 12V Rail (in)"
label in2 "PMIC-3 COMEX 1.8V Rail (out)"
label in3 "PMIC-3 COMEX 1.05V Rail (out)"
label in1 "PMIC-3 PSU 12V Rail (in1)"
label in2 "PMIC-3 PSU 12V Rail (in2)"
label in3 "PMIC-3 COMEX 1.8V Rail (out)"
label in4 "PMIC-3 COMEX 1.05V Rail (out)"
label temp1 "PMIC-3 Temp 1"
label temp2 "PMIC-3 Temp 2"
label power1 "PMIC-3 COMEX 1.8V Rail Pwr (out)"
label power2 "PMIC-3 COMEX 1.05V Rail Pwr (out)"
label curr1 "PMIC-3 COMEX 1.8V Rail Curr (out)"
label curr2 "PMIC-3 COMEX 1.05V Rail Curr (out)"
chip "tps53679-i2c-*-61"
label in1 "PMIC-4 PSU 12V Rail (in)"
label in2 "PMIC-4 COMEX 1.2V Rail (out)"
ignore in3
label in1 "PMIC-4 PSU 12V Rail (in1)"
label in2 "PMIC-4 PSU 12V Rail (in2)"
label in3 "PMIC-4 COMEX 1.2V Rail (out)"
ignore in4
label temp1 "PMIC-4 Temp 1"
label temp2 "PMIC-4 Temp 2"
label power1 "PMIC-4 COMEX 1.2V Rail Pwr (out)"
Expand Down
42 changes: 24 additions & 18 deletions device/mellanox/x86_64-mlnx_msn3800-r0/sensors.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,39 +22,43 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)"
# Power controllers
bus "i2c-5" "i2c-1-mux (chan_id 4)"
chip "tps53679-i2c-*-70"
label in1 "PMIC-1 PSU 12V Rail (in)"
label in2 "PMIC-1 ASIC 0.8V VCORE Rail (out)"
label in3 "PMIC-1 ASIC 1.2V Rail (out)"
label in1 "PMIC-1 PSU 12V Rail (in1)"
label in2 "PMIC-1 PSU 12V Rail (in2)"
label in3 "PMIC-1 ASIC 0.8V VCORE Rail (out)"
label in4 "PMIC-1 ASIC 1.2V Rail (out)"
label temp1 "PMIC-1 Temp 1"
label temp2 "PMIC-1 Temp 2"
label power1 "PMIC-1 ASIC 0.8V VCORE Rail Pwr (out)"
label power2 "PMIC-1 ASIC 1.2V Rail Pwr (out)"
label curr1 "PMIC-1 ASIC 0.8V VCORE Rail Curr (out)"
label curr2 "PMIC-1 ASIC 1.2V Rail Curr (out)"
chip "tps53679-i2c-*-71"
label in1 "PMIC-2 PSU 12V Rail (in)"
label in2 "PMIC-2 GB 0.8V Rail (out)"
label in3 "PMIC-2 GB 1.125V Rail (out)"
label in1 "PMIC-2 PSU 12V Rail (in1)"
label in2 "PMIC-2 PSU 12V Rail (in2)"
label in3 "PMIC-2 GB 0.8V Rail (out)"
label in4 "PMIC-2 GB 1.125V Rail (out)"
label temp1 "PMIC-2 Temp 1"
label temp2 "PMIC-2 Temp 2"
label power1 "PMIC-2 GB 0.8V Rail Pwr (out)"
label power2 "PMIC-2 GB 1.125V Rail Pwr (out)"
label curr1 "PMIC-2 GB 0.8V Rail Curr (out)"
label curr2 "PMIC-2 GB 1.125V Rail Curr (out)"
chip "tps53679-i2c-*-72"
label in1 "PMIC-3 PSU 12V Rail (in)"
label in2 "PMIC-3 ASIC 1.8V Rail (out)"
ignore in3
label in1 "PMIC-3 PSU 12V Rail (in1)"
label in2 "PMIC-3 PSU 12V Rail (in2)"
label in3 "PMIC-3 ASIC 1.8V Rail (out)"
ignore in4
label temp1 "PMIC-3 Temp 1"
label temp2 "PMIC-3 Temp 2"
label power1 "PMIC-3 ASIC 1.8V Rail Pwr (out)"
ignore power2
label curr1 "PMIC-3 ASIC 1.8V Rail Curr (out)"
ignore curr2
chip "tps53679-i2c-*-73"
label in1 "PMIC-4 PSU 12V Rail (in)"
label in2 "PMIC-4 GB 0.8V Rail (out)"
label in3 "PMIC-4 GB 1.125V Rail (out)"
label in1 "PMIC-4 PSU 12V Rail (in1)"
label in2 "PMIC-4 PSU 12V Rail (in2)"
label in3 "PMIC-4 GB 0.8V Rail (out)"
label in4 "PMIC-4 GB 1.125V Rail (out)"
label temp1 "PMIC-4 Temp 1"
label temp2 "PMIC-4 Temp 2"
label power1 "PMIC-4 GB 0.8V Rail Pwr (out)"
Expand All @@ -64,19 +68,21 @@ bus "i2c-5" "i2c-1-mux (chan_id 4)"

bus "i2c-15" "i2c-1-mux (chan_id 6)"
chip "tps53679-i2c-*-58"
label in1 "PMIC-5 PSU 12V Rail (in)"
label in2 "PMIC-5 COMEX 1.8V Rail (out)"
label in3 "PMIC-5 COMEX 1.05V Rail (out)"
label in1 "PMIC-5 PSU 12V Rail (in1)"
label in2 "PMIC-5 PSU 12V Rail (in2)"
label in3 "PMIC-5 COMEX 1.8V Rail (out)"
label in4 "PMIC-5 COMEX 1.05V Rail (out)"
label temp1 "PMIC-5 Temp 1"
label temp2 "PMIC-5 Temp 2"
label power1 "PMIC-5 COMEX 1.8V Rail Pwr (out)"
label power2 "PMIC-5 COMEX 1.05V Rail Pwr (out)"
label curr1 "PMIC-5 COMEX 1.8V Rail Curr (out)"
label curr2 "PMIC-5 COMEX 1.05V Rail Curr (out)"
chip "tps53679-i2c-*-61"
label in1 "PMIC-6 PSU 12V Rail (in)"
label in2 "PMIC-6 COMEX 1.2V Rail (out)"
ignore in3
label in1 "PMIC-6 PSU 12V Rail (in1)"
label in2 "PMIC-6 PSU 12V Rail (in2)"
label in3 "PMIC-6 COMEX 1.2V Rail (out)"
ignore in4
label temp1 "PMIC-6 Temp 1"
label temp2 "PMIC-6 Temp 2"
label power1 "PMIC-6 COMEX 1.2V Rail Pwr (out)"
Expand Down

0 comments on commit d15d9f9

Please sign in to comment.