[Mellanox] Revise label name and fix typo in sensor.conf of 4600C (#16271)

- Why I did it
Revise lable name and fix typo in sensor.conf of 4600C

- How I did it
Revise lable name and fix typo in sensor.conf of 4600C

- How to verify it
Manual test
sonic-mgmt test_sensors.py
This commit is contained in:
Junchao-Mellanox 2023-09-01 00:41:12 +08:00 committed by GitHub
parent 110dc1e247
commit 0be57803e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,5 @@
##
## Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
## Copyright (c) 2022 - 2023 NVIDIA CORPORATION & AFFILIATES.
## Apache-2.0
##
## Licensed under the Apache License, Version 2.0 (the "License");
@ -34,19 +34,19 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)"
bus "i2c-5" "i2c-1-mux (chan_id 4)"
chip "xdpe12284-i2c-*-62"
label in1 "PMIC-1 PSU 12V Rail (in1)"
ignore in2
ignore in2
label in3 "PMIC-1 ASIC VCORE_MAIN Rail (out1)"
ignore in4
ignore in4
label temp1 "PMIC-1 ASIC VCORE_MAIN Temp 1"
ignore temp2
ignore temp2
label power1 "PMIC-1 12V ASIC VCORE_MAIN Rail Pwr (in)"
ignore power2
ignore power2
label power3 "PMIC-1 ASIC VCORE_MAIN Rail Pwr (out1)"
ignore power4
ignore power4
label curr1 "PMIC-1 12V ASIC VCORE_MAIN Rail Curr (in1)"
ignore curr2
ignore curr2
label curr3 "PMIC-1 ASIC VCORE_MAIN Rail Curr (out1)"
ignore curr4
ignore curr4
chip "xdpe12284-i2c-*-64"
label in1 "PMIC-2 PSU 12V Rail (in1)"
label in2 "PMIC-2 PSU 12V Rail (in2)"
@ -55,7 +55,7 @@ bus "i2c-5" "i2c-1-mux (chan_id 4)"
label temp1 "PMIC-2 ASIC 1.8V_MAIN Temp 1"
label temp2 "PMIC-2 ASIC 1.2V_MAIN Temp 2"
label power1 "PMIC-2 12V ASIC 1.8V_1.2V_MAIN Rail Pwr (in)"
ignore power2
ignore power2
label power3 "PMIC-2 ASIC 1.8V_MAIN Rail Pwr (out1)"
label power4 "PMIC-2 ASIC 1.2V_MAIN Rail Pwr (out2)"
label curr1 "PMIC-2 12V ASIC 1.8V_MAIN Rail Curr (in1)"
@ -64,92 +64,92 @@ bus "i2c-5" "i2c-1-mux (chan_id 4)"
label curr4 "PMIC-2 ASIC 1.2V_MAIN Rail Curr (out2)"
chip "xdpe12284-i2c-*-66"
label in1 "PMIC-3 PSU 12V Rail (in1)"
label in2 "PMIC-2 PSU 12V Rail (in2)"
label in2 "PMIC-3 PSU 12V Rail (in2)"
label in3 "PMIC-3 ASIC VCORE_T0_1 Rail (out1)"
label in4 "PMIC-3 ASIC 1.8V_T0_1 Rail (out2)"
label temp1 "PMIC-3 ASIC VCORE_T0_1 Temp 1"
label temp2 "PMIC-3 ASIC 1.8V_T0_1 Temp 2"
label power1 "PMIC-3 12V ASIC VCORE_1.8V_T0_1 Rail Pwr (in) "
ignore power2
label power3 "PMIC-2 ASIC VCORE_T0_1 Rail Pwr (out1)"
label power4 "PMIC-2 ASIC 1.8V_T0_1 Rail Pwr (out2)"
label curr1 "PMIC-2 12V ASIC VCORE_T0_1 Rail Curr (in1)"
label curr2 "PMIC-2 12V ASIC 1.8V_T0_1 Rail Curr (in2)"
label curr3 "PMIC-2 ASIC VCORE_T0_1 Rail Curr (out1)"
label curr4 "PMIC-2 ASIC 1.8V_T0_1 Rail Curr (out2)"
ignore power2
label power3 "PMIC-3 ASIC VCORE_T0_1 Rail Pwr (out1)"
label power4 "PMIC-3 ASIC 1.8V_T0_1 Rail Pwr (out2)"
label curr1 "PMIC-3 12V ASIC VCORE_T0_1 Rail Curr (in1)"
label curr2 "PMIC-3 12V ASIC 1.8V_T0_1 Rail Curr (in2)"
label curr3 "PMIC-3 ASIC VCORE_T0_1 Rail Curr (out1)"
label curr4 "PMIC-3 ASIC 1.8V_T0_1 Rail Curr (out2)"
chip "xdpe12284-i2c-*-68"
label in1 "PMIC-3 PSU 12V Rail (in1)"
label in2 "PMIC-2 PSU 12V Rail (in2)"
label in3 "PMIC-3 ASIC VCORE_T2_3 Rail (out1)"
label in4 "PMIC-3 ASIC 1.8V_T2_3 Rail (out2)"
label temp1 "PMIC-3 ASIC VCORE_T2_3 Temp 1"
label temp2 "PMIC-3 ASIC 1.8V_T2_3 Temp 2"
label power1 "PMIC-3 12V ASIC VCORE_1.8V_T2_3 Rail Pwr (in) "
ignore power2
label power3 "PMIC-2 ASIC VCORE_T2_3 Rail Pwr (out1)"
label power4 "PMIC-2 ASIC 1.8V_T2_3 Rail Pwr (out2)"
label curr1 "PMIC-2 12V ASIC VCORE_T2_3 Rail Curr (in1)"
label curr2 "PMIC-2 12V ASIC 1.8V_T2_3 Rail Curr (in2)"
label curr3 "PMIC-2 ASIC VCORE_T2_3 Rail Curr (out1)"
label curr4 "PMIC-2 ASIC 1.8V_T2_3 Rail Curr (out2)"
label in1 "PMIC-4 PSU 12V Rail (in1)"
label in2 "PMIC-4 PSU 12V Rail (in2)"
label in3 "PMIC-4 ASIC VCORE_T2_3 Rail (out1)"
label in4 "PMIC-4 ASIC 1.8V_T2_3 Rail (out2)"
label temp1 "PMIC-4 ASIC VCORE_T2_3 Temp 1"
label temp2 "PMIC-4 ASIC 1.8V_T2_3 Temp 2"
label power1 "PMIC-4 12V ASIC VCORE_1.8V_T2_3 Rail Pwr (in) "
ignore power2
label power3 "PMIC-4 ASIC VCORE_T2_3 Rail Pwr (out1)"
label power4 "PMIC-4 ASIC 1.8V_T2_3 Rail Pwr (out2)"
label curr1 "PMIC-4 12V ASIC VCORE_T2_3 Rail Curr (in1)"
label curr2 "PMIC-4 12V ASIC 1.8V_T2_3 Rail Curr (in2)"
label curr3 "PMIC-4 ASIC VCORE_T2_3 Rail Curr (out1)"
label curr4 "PMIC-4 ASIC 1.8V_T2_3 Rail Curr (out2)"
chip "xdpe12284-i2c-*-6a"
label in1 "PMIC-3 PSU 12V Rail (in1)"
label in2 "PMIC-2 PSU 12V Rail (in2)"
label in3 "PMIC-3 ASIC VCORE_T4_5 Rail (out1)"
label in4 "PMIC-3 ASIC 1.8V_T4_5 Rail (out2)"
label temp1 "PMIC-3 ASIC VCORE_T4_5 Temp 1"
label temp2 "PMIC-3 ASIC 1.8V_T4_5 Temp 2"
label power1 "PMIC-3 12V ASIC VCORE_1.8V_T4_5 Rail Pwr (in) "
ignore power2
label power3 "PMIC-2 ASIC VCORE_T4_5 Rail Pwr (out1)"
label power4 "PMIC-2 ASIC 1.8V_T4_5 Rail Pwr (out2)"
label curr1 "PMIC-2 12V ASIC VCORE_T4_5 Rail Curr (in1)"
label curr2 "PMIC-2 12V ASIC 1.8V_T4_5 Rail Curr (in2)"
label curr3 "PMIC-2 ASIC VCORE_T4_5 Rail Curr (out1)"
label curr4 "PMIC-2 ASIC 1.8V_T4_5 Rail Curr (out2)"
label in1 "PMIC-5 PSU 12V Rail (in1)"
label in2 "PMIC-5 PSU 12V Rail (in2)"
label in3 "PMIC-5 ASIC VCORE_T4_5 Rail (out1)"
label in4 "PMIC-5 ASIC 1.8V_T4_5 Rail (out2)"
label temp1 "PMIC-5 ASIC VCORE_T4_5 Temp 1"
label temp2 "PMIC-5 ASIC 1.8V_T4_5 Temp 2"
label power1 "PMIC-5 12V ASIC VCORE_1.8V_T4_5 Rail Pwr (in) "
ignore power2
label power3 "PMIC-5 ASIC VCORE_T4_5 Rail Pwr (out1)"
label power4 "PMIC-5 ASIC 1.8V_T4_5 Rail Pwr (out2)"
label curr1 "PMIC-5 12V ASIC VCORE_T4_5 Rail Curr (in1)"
label curr2 "PMIC-5 12V ASIC 1.8V_T4_5 Rail Curr (in2)"
label curr3 "PMIC-5 ASIC VCORE_T4_5 Rail Curr (out1)"
label curr4 "PMIC-5 ASIC 1.8V_T4_5 Rail Curr (out2)"
chip "xdpe12284-i2c-*-6c"
label in1 "PMIC-3 PSU 12V Rail (in1)"
label in2 "PMIC-2 PSU 12V Rail (in2)"
label in3 "PMIC-3 ASIC VCORE_T6_7 Rail (out1)"
label in4 "PMIC-3 ASIC 1.8V_T6_7 Rail (out2)"
label temp1 "PMIC-3 ASIC VCORE_T6_7 Temp 1"
label temp2 "PMIC-3 ASIC 1.8V_T6_7 Temp 2"
label power1 "PMIC-3 12V ASIC VCORE_1.8V_T6_7 Rail Pwr (in) "
ignore power2
label power3 "PMIC-2 ASIC VCORE_T6_7 Rail Pwr (out1)"
label power4 "PMIC-2 ASIC 1.8V_T6_7 Rail Pwr (out2)"
label curr1 "PMIC-2 12V ASIC VCORE_T6_7 Rail Curr (in1)"
label curr2 "PMIC-2 12V ASIC 1.8V_T6_7 Rail Curr (in2)"
label curr3 "PMIC-2 ASIC VCORE_T6_7 Rail Curr (out1)"
label curr4 "PMIC-2 ASIC 1.8V_T6_7 Rail Curr (out2)"
label in1 "PMIC-6 PSU 12V Rail (in1)"
label in2 "PMIC-6 PSU 12V Rail (in2)"
label in3 "PMIC-6 ASIC VCORE_T6_7 Rail (out1)"
label in4 "PMIC-6 ASIC 1.8V_T6_7 Rail (out2)"
label temp1 "PMIC-6 ASIC VCORE_T6_7 Temp 1"
label temp2 "PMIC-6 ASIC 1.8V_T6_7 Temp 2"
label power1 "PMIC-6 12V ASIC VCORE_1.8V_T6_7 Rail Pwr (in) "
ignore power2
label power3 "PMIC-6 ASIC VCORE_T6_7 Rail Pwr (out1)"
label power4 "PMIC-6 ASIC 1.8V_T6_7 Rail Pwr (out2)"
label curr1 "PMIC-6 12V ASIC VCORE_T6_7 Rail Curr (in1)"
label curr2 "PMIC-6 12V ASIC 1.8V_T6_7 Rail Curr (in2)"
label curr3 "PMIC-6 ASIC VCORE_T6_7 Rail Curr (out1)"
label curr4 "PMIC-6 ASIC 1.8V_T6_7 Rail Curr (out2)"
chip "xdpe12284-i2c-*-6e"
label in1 "PMIC-3 PSU 12V Rail (in1)"
label in2 "PMIC-2 PSU 12V Rail (in2)"
label in3 "PMIC-3 ASIC 1.2V_T0_3 Rail (out1)"
label in4 "PMIC-3 ASIC 1.2V_T4_7 Rail (out2)"
label temp1 "PMIC-3 ASIC 1.2V_T0_3 Temp 1"
label temp2 "PMIC-3 ASIC 1.2V_T4_7 Temp 2"
label power1 "PMIC-3 12V ASIC 1.2V_T0_3_T4_7 Rail Pwr (in) "
ignore power2
label power3 "PMIC-2 ASIC 1.2V_T0_3 Rail Pwr (out1)"
label power4 "PMIC-2 ASIC 1.2V_T4_7 Rail Pwr (out2)"
label curr1 "PMIC-2 12V ASIC 1.2V_T0_3 Rail Curr (in1)"
label curr2 "PMIC-2 12V ASIC 1.2V_T4_7 Rail Curr (in2)"
label curr3 "PMIC-2 ASIC 1.2V_T0_3 Rail Curr (out1)"
label curr4 "PMIC-2 ASIC 1.2V_T4_7 Rail Curr (out2)"
label in1 "PMIC-7 PSU 12V Rail (in1)"
label in2 "PMIC-7 PSU 12V Rail (in2)"
label in3 "PMIC-7 ASIC 1.2V_T0_3 Rail (out1)"
label in4 "PMIC-7 ASIC 1.2V_T4_7 Rail (out2)"
label temp1 "PMIC-7 ASIC 1.2V_T0_3 Temp 1"
label temp2 "PMIC-7 ASIC 1.2V_T4_7 Temp 2"
label power1 "PMIC-7 12V ASIC 1.2V_T0_3_T4_7 Rail Pwr (in) "
ignore power2
label power3 "PMIC-7 ASIC 1.2V_T0_3 Rail Pwr (out1)"
label power4 "PMIC-7 ASIC 1.2V_T4_7 Rail Pwr (out2)"
label curr1 "PMIC-7 12V ASIC 1.2V_T0_3 Rail Curr (in1)"
label curr2 "PMIC-7 12V ASIC 1.2V_T4_7 Rail Curr (in2)"
label curr3 "PMIC-7 ASIC 1.2V_T0_3 Rail Curr (out1)"
label curr4 "PMIC-7 ASIC 1.2V_T4_7 Rail Curr (out2)"
bus "i2c-15" "i2c-1-mux (chan_id 6)"
chip "tps53679-i2c-*-58"
label in1 "PMIC-8 PSU 12V Rail (in1)"
label in2 "PMIC-8 PSU 12V Rail (in2)"
label in3 "PMIC-8 COMEX 1.8V Rail (out)"
label in4 "PMIC-8 COMEX 1.05V Rail (out)"
label in3 "PMIC-8 COMEX 1.8V Rail (out1)"
label in4 "PMIC-8 COMEX 1.05V Rail (out2)"
label temp1 "PMIC-8 Temp 1"
label temp2 "PMIC-8 Temp 2"
label power1 "PMIC-8 COMEX 1.8V Rail Pwr (out)"
label power2 "PMIC-8 COMEX 1.05V Rail Pwr (out)"
label curr1 "PMIC-8 COMEX 1.8V Rail Curr (out)"
label curr2 "PMIC-8 COMEX 1.05V Rail Curr (out)"
label power1 "PMIC-8 COMEX 1.8V Rail Pwr (out1)"
label power2 "PMIC-8 COMEX 1.05V Rail Pwr (out2)"
label curr1 "PMIC-8 COMEX 1.8V Rail Curr (out1)"
label curr2 "PMIC-8 COMEX 1.05V Rail Curr (out2)"
chip "tps53679-i2c-*-61"
label in1 "PMIC-9 PSU 12V Rail (in1)"
label in2 "PMIC-9 PSU 12V Rail (in2)"
@ -157,35 +157,35 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)"
ignore in4
label temp1 "PMIC-9 Temp 1"
label temp2 "PMIC-9 Temp 2"
label power1 "PMIC-9 COMEX 1.2V Rail Pwr (out)"
ignore power2
label curr1 "PMIC-9 COMEX 1.2V Rail Curr (out)"
ignore curr2
label power1 "PMIC-9 COMEX 1.2V Rail Pwr (out1)"
ignore power2
label curr1 "PMIC-9 COMEX 1.2V Rail Curr (out1)"
ignore curr2
chip "mp2975-i2c-*-6a"
label in1 "PMIC-3 PSU 12V Rail (in1)"
label in2 "PMIC-3 COMEX 1.8V Rail (out)"
label in3 "PMIC-3 COMEX 1.05V Rail (out)"
label temp1 "PMIC-3 Temp 1"
label power1 "PMIC-3 COMEX 12V Rail Pwr (in)"
label power2 "PMIC-3 COMEX 1.8V Rail Pwr (out)"
label power3 "PMIC-3 COMEX 1.05V Rail Pwr (out)"
label curr1 "PMIC-3 COMEX 12V Rail Curr (in)"
label curr2 "PMIC-3 COMEX 1.8V Rail Curr (out)"
label in1 "PMIC-8 PSU 12V Rail (in1)"
label in2 "PMIC-8 COMEX 1.8V Rail (out)"
label in3 "PMIC-8 COMEX 1.05V Rail (out)"
label temp1 "PMIC-8 Temp 1"
label power1 "PMIC-8 COMEX 12V Rail Pwr (in)"
label power2 "PMIC-8 COMEX 1.8V Rail Pwr (out)"
label power3 "PMIC-8 COMEX 1.05V Rail Pwr (out)"
label curr1 "PMIC-8 COMEX 12V Rail Curr (in)"
label curr2 "PMIC-8 COMEX 1.8V Rail Curr (out)"
ignore curr3
ignore curr4
label curr5 "PMIC-3 COMEX 1.05V Rail Curr (out)"
label curr5 "PMIC-8 COMEX 1.05V Rail Curr (out)"
ignore curr6
chip "mp2975-i2c-*-61"
label in1 "PMIC-4 PSU 12V Rail (in1)"
label in2 "PMIC-4 COMEX 1.2V Rail (out)"
label temp1 "PMIC-4 Temp 1"
label temp2 "PMIC-4 Temp 2"
label power1 "PMIC-4 COMEX 12V Rail Pwr (in)"
label power2 "PMIC-4 COMEX 1.2V Rail Pwr (out)"
label curr1 "PMIC-4 COMEX 12V Rail Curr (in)"
label curr2 "PMIC-4 COMEX 1.2V Rail Curr (out)"
label in1 "PMIC-9 PSU 12V Rail (in1)"
label in2 "PMIC-9 COMEX 1.2V Rail (out)"
label temp1 "PMIC-9 Temp 1"
label temp2 "PMIC-9 Temp 2"
label power1 "PMIC-9 COMEX 12V Rail Pwr (in)"
label power2 "PMIC-9 COMEX 1.2V Rail Pwr (out)"
label curr1 "PMIC-9 COMEX 12V Rail Curr (in)"
label curr2 "PMIC-9 COMEX 1.2V Rail Curr (out)"
ignore curr3
# Power supplies
@ -195,6 +195,8 @@ bus "i2c-4" "i2c-1-mux (chan_id 3)"
ignore in2
label in3 "PSU-1(L) 12V Rail (out)"
label fan1 "PSU-1(L) Fan 1"
ignore fan2
ignore fan3
label temp1 "PSU-1(L) Temp 1"
label temp2 "PSU-1(L) Temp 2"
label temp3 "PSU-1(L) Temp 3"
@ -210,6 +212,8 @@ bus "i2c-4" "i2c-1-mux (chan_id 3)"
ignore in2
label in3 "PSU-2(R) 12V Rail (out)"
label fan1 "PSU-2(R) Fan 1"
ignore fan2
ignore fan3
label temp1 "PSU-2(R) Temp 1"
label temp2 "PSU-2(R) Temp 2"
label temp3 "PSU-2(R) Temp 3"