matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[Mellanox] Fix error in sensors.conf for 3700/3700c/3800 (#4506)

Browse Source
This commit is contained in:
Stephen Sun 2020-05-01 01:30:58 +08:00 committed by GitHub
parent 6850644640
commit a87bf4df83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 58 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
device/mellanox/x86_64-mlnx_msn3700-r0/sensors.conf
View File

@ -22,9 +22,10 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)"
# Power controllers # Power controllers
bus "i2c-5" "i2c-1-mux (chan_id 4)" bus "i2c-5" "i2c-1-mux (chan_id 4)"
chip "tps53679-i2c-*-70" chip "tps53679-i2c-*-70"
label in1 "PMIC-1 PSU 12V Rail (in)" label in1 "PMIC-1 PSU 12V Rail (in1)"
label in2 "PMIC-1 ASIC 0.8V VCORE Rail (out)" label in2 "PMIC-1 PSU 12V Rail (in2)"
label in3 "PMIC-1 ASIC 1.2V Rail (out)" 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 temp1 "PMIC-1 Temp 1"
label temp2 "PMIC-1 Temp 2" label temp2 "PMIC-1 Temp 2"
label power1 "PMIC-1 ASIC 0.8V VCORE Rail Pwr (out)" label power1 "PMIC-1 ASIC 0.8V VCORE Rail Pwr (out)"
@ -32,10 +33,11 @@ bus "i2c-5" "i2c-1-mux (chan_id 4)"
label curr1 "PMIC-1 ASIC 0.8V VCORE Rail Curr (out)" label curr1 "PMIC-1 ASIC 0.8V VCORE Rail Curr (out)"
label curr2 "PMIC-1 ASIC 1.2V Rail Curr (out)" label curr2 "PMIC-1 ASIC 1.2V Rail Curr (out)"
chip "tps53679-i2c-*-71" chip "tps53679-i2c-*-71"
label in1 "PMIC-2 PSU 12V Rail (in)" label in1 "PMIC-2 PSU 12V Rail (in1)"
label in2 "PMIC-2 ASIC 3.3V Rail (out)" label in2 "PMIC-2 PSU 12V Rail (in2)"
compute in2 (1.5)*@, @/(1.5) label in3 "PMIC-2 ASIC 3.3V Rail (out)"
label in3 "PMIC-2 ASIC 1.8V Rail (out)" compute in3 (1.5)*@, @/(1.5)
label in4 "PMIC-2 ASIC 1.8V Rail (out)"
label temp1 "PMIC-2 Temp 1" label temp1 "PMIC-2 Temp 1"
label temp2 "PMIC-2 Temp 2" label temp2 "PMIC-2 Temp 2"
label power1 "PMIC-2 ASIC 3.3V Rail Pwr (out)" label power1 "PMIC-2 ASIC 3.3V Rail Pwr (out)"
@ -45,9 +47,10 @@ bus "i2c-5" "i2c-1-mux (chan_id 4)"
bus "i2c-15" "i2c-1-mux (chan_id 6)" bus "i2c-15" "i2c-1-mux (chan_id 6)"
chip "tps53679-i2c-*-58" chip "tps53679-i2c-*-58"
label in1 "PMIC-3 PSU 12V Rail (in)" label in1 "PMIC-3 PSU 12V Rail (in1)"
label in2 "PMIC-3 COMEX 1.8V Rail (out)" label in2 "PMIC-3 PSU 12V Rail (in2)"
label in3 "PMIC-3 COMEX 1.05V Rail (out)" 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 temp1 "PMIC-3 Temp 1"
label temp2 "PMIC-3 Temp 2" label temp2 "PMIC-3 Temp 2"
label power1 "PMIC-3 COMEX 1.8V Rail Pwr (out)" label power1 "PMIC-3 COMEX 1.8V Rail Pwr (out)"
@ -55,9 +58,10 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)"
label curr1 "PMIC-3 COMEX 1.8V Rail Curr (out)" label curr1 "PMIC-3 COMEX 1.8V Rail Curr (out)"
label curr2 "PMIC-3 COMEX 1.05V Rail Curr (out)" label curr2 "PMIC-3 COMEX 1.05V Rail Curr (out)"
chip "tps53679-i2c-*-61" chip "tps53679-i2c-*-61"
label in1 "PMIC-4 PSU 12V Rail (in)" label in1 "PMIC-4 PSU 12V Rail (in1)"
label in2 "PMIC-4 COMEX 1.2V Rail (out)" label in2 "PMIC-4 PSU 12V Rail (in2)"
ignore in3 label in3 "PMIC-4 COMEX 1.2V Rail (out)"
ignore in4
label temp1 "PMIC-4 Temp 1" label temp1 "PMIC-4 Temp 1"
label temp2 "PMIC-4 Temp 2" label temp2 "PMIC-4 Temp 2"
label power1 "PMIC-4 COMEX 1.2V Rail Pwr (out)" label power1 "PMIC-4 COMEX 1.2V Rail Pwr (out)"

30
device/mellanox/x86_64-mlnx_msn3700c-r0/sensors.conf
View File

@ -22,9 +22,10 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)"
# Power controllers # Power controllers
bus "i2c-5" "i2c-1-mux (chan_id 4)" bus "i2c-5" "i2c-1-mux (chan_id 4)"
chip "tps53679-i2c-*-70" chip "tps53679-i2c-*-70"
label in1 "PMIC-1 PSU 12V Rail (in)" label in1 "PMIC-1 PSU 12V Rail (in1)"
label in2 "PMIC-1 ASIC 0.8V VCORE Rail (out)" label in2 "PMIC-1 PSU 12V Rail (in2)"
label in3 "PMIC-1 ASIC 1.2V Rail (out)" 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 temp1 "PMIC-1 Temp 1"
label temp2 "PMIC-1 Temp 2" label temp2 "PMIC-1 Temp 2"
label power1 "PMIC-1 ASIC 0.8V VCORE Rail Pwr (out)" label power1 "PMIC-1 ASIC 0.8V VCORE Rail Pwr (out)"
@ -32,10 +33,11 @@ bus "i2c-5" "i2c-1-mux (chan_id 4)"
label curr1 "PMIC-1 ASIC 0.8V VCORE Rail Curr (out)" label curr1 "PMIC-1 ASIC 0.8V VCORE Rail Curr (out)"
label curr2 "PMIC-1 ASIC 1.2V Rail Curr (out)" label curr2 "PMIC-1 ASIC 1.2V Rail Curr (out)"
chip "tps53679-i2c-*-71" chip "tps53679-i2c-*-71"
label in1 "PMIC-2 PSU 12V Rail (in)" label in1 "PMIC-2 PSU 12V Rail (in1)"
label in2 "PMIC-2 ASIC 3.3V Rail (out)" label in2 "PMIC-2 PSU 12V Rail (in2)"
compute in2 (1.5)*@, @/(1.5) label in3 "PMIC-2 ASIC 3.3V Rail (out)"
label in3 "PMIC-2 ASIC 1.8V Rail (out)" compute in3 (1.5)*@, @/(1.5)
label in4 "PMIC-2 ASIC 1.8V Rail (out)"
label temp1 "PMIC-2 Temp 1" label temp1 "PMIC-2 Temp 1"
label temp2 "PMIC-2 Temp 2" label temp2 "PMIC-2 Temp 2"
label power1 "PMIC-2 ASIC 3.3V Rail Pwr (out)" label power1 "PMIC-2 ASIC 3.3V Rail Pwr (out)"
@ -45,9 +47,10 @@ bus "i2c-5" "i2c-1-mux (chan_id 4)"
bus "i2c-15" "i2c-1-mux (chan_id 6)" bus "i2c-15" "i2c-1-mux (chan_id 6)"
chip "tps53679-i2c-*-58" chip "tps53679-i2c-*-58"
label in1 "PMIC-3 PSU 12V Rail (in)" label in1 "PMIC-3 PSU 12V Rail (in1)"
label in2 "PMIC-3 COMEX 1.8V Rail (out)" label in2 "PMIC-3 PSU 12V Rail (in2)"
label in3 "PMIC-3 COMEX 1.05V Rail (out)" 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 temp1 "PMIC-3 Temp 1"
label temp2 "PMIC-3 Temp 2" label temp2 "PMIC-3 Temp 2"
label power1 "PMIC-3 COMEX 1.8V Rail Pwr (out)" label power1 "PMIC-3 COMEX 1.8V Rail Pwr (out)"
@ -55,9 +58,10 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)"
label curr1 "PMIC-3 COMEX 1.8V Rail Curr (out)" label curr1 "PMIC-3 COMEX 1.8V Rail Curr (out)"
label curr2 "PMIC-3 COMEX 1.05V Rail Curr (out)" label curr2 "PMIC-3 COMEX 1.05V Rail Curr (out)"
chip "tps53679-i2c-*-61" chip "tps53679-i2c-*-61"
label in1 "PMIC-4 PSU 12V Rail (in)" label in1 "PMIC-4 PSU 12V Rail (in1)"
label in2 "PMIC-4 COMEX 1.2V Rail (out)" label in2 "PMIC-4 PSU 12V Rail (in2)"
ignore in3 label in3 "PMIC-4 COMEX 1.2V Rail (out)"
ignore in4
label temp1 "PMIC-4 Temp 1" label temp1 "PMIC-4 Temp 1"
label temp2 "PMIC-4 Temp 2" label temp2 "PMIC-4 Temp 2"
label power1 "PMIC-4 COMEX 1.2V Rail Pwr (out)" label power1 "PMIC-4 COMEX 1.2V Rail Pwr (out)"

42
device/mellanox/x86_64-mlnx_msn3800-r0/sensors.conf
View File

@ -22,9 +22,10 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)"
# Power controllers # Power controllers
bus "i2c-5" "i2c-1-mux (chan_id 4)" bus "i2c-5" "i2c-1-mux (chan_id 4)"
chip "tps53679-i2c-*-70" chip "tps53679-i2c-*-70"
label in1 "PMIC-1 PSU 12V Rail (in)" label in1 "PMIC-1 PSU 12V Rail (in1)"
label in2 "PMIC-1 ASIC 0.8V VCORE Rail (out)" label in2 "PMIC-1 PSU 12V Rail (in2)"
label in3 "PMIC-1 ASIC 1.2V Rail (out)" 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 temp1 "PMIC-1 Temp 1"
label temp2 "PMIC-1 Temp 2" label temp2 "PMIC-1 Temp 2"
label power1 "PMIC-1 ASIC 0.8V VCORE Rail Pwr (out)" label power1 "PMIC-1 ASIC 0.8V VCORE Rail Pwr (out)"
@ -32,9 +33,10 @@ bus "i2c-5" "i2c-1-mux (chan_id 4)"
label curr1 "PMIC-1 ASIC 0.8V VCORE Rail Curr (out)" label curr1 "PMIC-1 ASIC 0.8V VCORE Rail Curr (out)"
label curr2 "PMIC-1 ASIC 1.2V Rail Curr (out)" label curr2 "PMIC-1 ASIC 1.2V Rail Curr (out)"
chip "tps53679-i2c-*-71" chip "tps53679-i2c-*-71"
label in1 "PMIC-2 PSU 12V Rail (in)" label in1 "PMIC-2 PSU 12V Rail (in1)"
label in2 "PMIC-2 GB 0.8V Rail (out)" label in2 "PMIC-2 PSU 12V Rail (in2)"
label in3 "PMIC-2 GB 1.125V Rail (out)" 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 temp1 "PMIC-2 Temp 1"
label temp2 "PMIC-2 Temp 2" label temp2 "PMIC-2 Temp 2"
label power1 "PMIC-2 GB 0.8V Rail Pwr (out)" label power1 "PMIC-2 GB 0.8V Rail Pwr (out)"
@ -42,9 +44,10 @@ bus "i2c-5" "i2c-1-mux (chan_id 4)"
label curr1 "PMIC-2 GB 0.8V Rail Curr (out)" label curr1 "PMIC-2 GB 0.8V Rail Curr (out)"
label curr2 "PMIC-2 GB 1.125V Rail Curr (out)" label curr2 "PMIC-2 GB 1.125V Rail Curr (out)"
chip "tps53679-i2c-*-72" chip "tps53679-i2c-*-72"
label in1 "PMIC-3 PSU 12V Rail (in)" label in1 "PMIC-3 PSU 12V Rail (in1)"
label in2 "PMIC-3 ASIC 1.8V Rail (out)" label in2 "PMIC-3 PSU 12V Rail (in2)"
ignore in3 label in3 "PMIC-3 ASIC 1.8V Rail (out)"
ignore in4
label temp1 "PMIC-3 Temp 1" label temp1 "PMIC-3 Temp 1"
label temp2 "PMIC-3 Temp 2" label temp2 "PMIC-3 Temp 2"
label power1 "PMIC-3 ASIC 1.8V Rail Pwr (out)" label power1 "PMIC-3 ASIC 1.8V Rail Pwr (out)"
@ -52,9 +55,10 @@ bus "i2c-5" "i2c-1-mux (chan_id 4)"
label curr1 "PMIC-3 ASIC 1.8V Rail Curr (out)" label curr1 "PMIC-3 ASIC 1.8V Rail Curr (out)"
ignore curr2 ignore curr2
chip "tps53679-i2c-*-73" chip "tps53679-i2c-*-73"
label in1 "PMIC-4 PSU 12V Rail (in)" label in1 "PMIC-4 PSU 12V Rail (in1)"
label in2 "PMIC-4 GB 0.8V Rail (out)" label in2 "PMIC-4 PSU 12V Rail (in2)"
label in3 "PMIC-4 GB 1.125V Rail (out)" 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 temp1 "PMIC-4 Temp 1"
label temp2 "PMIC-4 Temp 2" label temp2 "PMIC-4 Temp 2"
label power1 "PMIC-4 GB 0.8V Rail Pwr (out)" label power1 "PMIC-4 GB 0.8V Rail Pwr (out)"
@ -64,9 +68,10 @@ bus "i2c-5" "i2c-1-mux (chan_id 4)"
bus "i2c-15" "i2c-1-mux (chan_id 6)" bus "i2c-15" "i2c-1-mux (chan_id 6)"
chip "tps53679-i2c-*-58" chip "tps53679-i2c-*-58"
label in1 "PMIC-5 PSU 12V Rail (in)" label in1 "PMIC-5 PSU 12V Rail (in1)"
label in2 "PMIC-5 COMEX 1.8V Rail (out)" label in2 "PMIC-5 PSU 12V Rail (in2)"
label in3 "PMIC-5 COMEX 1.05V Rail (out)" 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 temp1 "PMIC-5 Temp 1"
label temp2 "PMIC-5 Temp 2" label temp2 "PMIC-5 Temp 2"
label power1 "PMIC-5 COMEX 1.8V Rail Pwr (out)" label power1 "PMIC-5 COMEX 1.8V Rail Pwr (out)"
@ -74,9 +79,10 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)"
label curr1 "PMIC-5 COMEX 1.8V Rail Curr (out)" label curr1 "PMIC-5 COMEX 1.8V Rail Curr (out)"
label curr2 "PMIC-5 COMEX 1.05V Rail Curr (out)" label curr2 "PMIC-5 COMEX 1.05V Rail Curr (out)"
chip "tps53679-i2c-*-61" chip "tps53679-i2c-*-61"
label in1 "PMIC-6 PSU 12V Rail (in)" label in1 "PMIC-6 PSU 12V Rail (in1)"
label in2 "PMIC-6 COMEX 1.2V Rail (out)" label in2 "PMIC-6 PSU 12V Rail (in2)"
ignore in3 label in3 "PMIC-6 COMEX 1.2V Rail (out)"
ignore in4
label temp1 "PMIC-6 Temp 1" label temp1 "PMIC-6 Temp 1"
label temp2 "PMIC-6 Temp 2" label temp2 "PMIC-6 Temp 2"
label power1 "PMIC-6 COMEX 1.2V Rail Pwr (out)" label power1 "PMIC-6 COMEX 1.2V Rail Pwr (out)"