Skip to content

Commit

Permalink
[Mellanox] remove sensor conf for SN4600 A0 platform due to EOL (#8629)
Browse files Browse the repository at this point in the history 
- Why I did it
SN4600 A0 platform was EOL, so there is no need to support it, sensor conf can be removed and we don't need to maintain 2 sensor conf files, only A1 platform is needed.

- How I did it
Remove get_sensors_conf_path which intends to load correct sensor conf for different(A0/A1) platforms.
Remove the sensor conf for A0 platform, rename previous sensor.conf.a1 to sensor.conf

- How to verify it
Run sensor test on the SN4600 platform.
  • Loading branch information
@keboliu @judyjoseph
keboliu authored and judyjoseph committed Sep 2, 2021
1 parent 0f1d58a commit 17d0dc3
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 251 deletions.
1 change: 0 additions & 1 deletion device/mellanox/x86_64-mlnx_msn4600-r0/get_sensors_conf_path
View file

This file was deleted.

178 changes: 61 additions & 117 deletions device/mellanox/x86_64-mlnx_msn4600-r0/sensors.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,134 +21,78 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)"

# Power controllers
bus "i2c-5" "i2c-1-mux (chan_id 4)"
chip "xdpe12284-i2c-*-62"
label in1 "PMIC-1 PSU 12V Rail (in)"
ignore in2
label in3 "PMIC-1 ASIC 0.8V VCORE_MAIN Rail (out)"
ignore in4
chip "mp2975-i2c-*-62"
label in1 "PMIC-1 PSU 12V Rail (in1)"
label in2 "PMIC-1 ASIC 0.8V VCORE MAIN Rail (out)"
label temp1 "PMIC-1 Temp 1"
label temp2 "PMIC-1 Temp 2"
label power1 "PMIC-1 ASIC 12V VCORE_MAIN Rail Pwr (in)"
ignore power2
label power3 "PMIC-1 ASIC 0.8V VCORE_MAIN Rail Pwr (out)"
ignore power4
label curr1 "PMIC-1 ASIC 12V VCORE_MAIN Rail Curr (in)"
ignore curr2
label curr3 "PMIC-1 ASIC 0.8V VCORE_MAIN Rail Curr (out)"
ignore curr4
chip "xdpe12284-i2c-*-64"
label in1 "PMIC-2 PSU 12V Rail_1 (in)"
label in2 "PMIC-2 PSU 12V Rail_2 (in)"
label in3 "PMIC-2 ASIC 1.8V Rail_1 (out)"
label in4 "PMIC-2 ASIC 1.2V Rail_2 (out)"
label power1 "PMIC-1 PSU 12V Rail Pwr (in1)"
label power2 "PMIC-1 ASIC 0.8V VCORE MAIN Rail Pwr (out)"
label curr1 "PMIC-1 PSU 12V Rail Curr (in1)"
label curr2 "PMIC-1 ASIC 0.8V VCORE MAIN Rail Curr (out)"
chip "mp2975-i2c-*-64"
label in1 "PMIC-2 PSU 12V Rail (in1)"
label in2 "PMIC-2 ASIC 1.8V VCORE MAIN Rail (out)"
label in3 "PMIC-2 ASIC 1.2V VCORE MAIN Rail (out)"
label temp1 "PMIC-2 Temp 1"
label temp2 "PMIC-2 Temp 2"
label power1 "PMIC-2 ASIC 12V Rail_1 Pwr (in)"
label power2 "PMIC-2 ASIC 12V Rail_2 Pwr (in)"
label power3 "PMIC-2 ASIC 1.8V Rail_1 Pwr (out)"
label power4 "PMIC-2 ASIC 1.2V Rail_2 Pwr (out)"
label curr1 "PMIC-2 ASIC 12V Rail_1 Curr (in)"
label curr2 "PMIC-2 ASIC 12V Rail_2 Curr (in)"
label curr3 "PMIC-2 ASIC 1.8V Rail_1 Curr (out)"
label curr4 "PMIC-2 ASIC 1.2V Rail_2 Curr (out)"
chip "xdpe12284-i2c-*-66"
label in1 "PMIC-3 PSU 12V Rail_1 (in)"
label in2 "PMIC-3 PSU 12V Rail_2 (in)"
label in3 "PMIC-3 ASIC 0.85V Rail_1 T0_1 (out)"
label in4 "PMIC-3 ASIC 1.8V Rail_2 T0_1 (out)"
label power1 "PMIC-2 PSU 12V Rail Pwr (in1)"
label power2 "PMIC-2 ASIC 1.8V VCORE MAIN Rail Pwr (out)"
label curr1 "PMIC-2 PSU 12V Rail Curr (in1)"
label curr2 "PMIC-2 ASIC 1.8V VCORE MAIN Rail Curr (out)"
label curr3 "PMIC-2 ASIC 1.2V VCORE MAIN Rail Curr (out)"
chip "mp2975-i2c-*-66"
label in1 "PMIC-3 PSU 12V Rail (in1)"
label in2 "PMIC-3 ASIC 0.85V T0_1 Rail (out)"
label in3 "PMIC-3 ASIC 1.8V T0_1 Rail (out)"
label temp1 "PMIC-3 Temp 1"
label temp2 "PMIC-3 Temp 2"
label power1 "PMIC-3 ASIC 12V Rail_1 Pwr (in)"
label power2 "PMIC-3 ASIC 12V Rail_2 Pwr (in)"
label power3 "PMIC-3 ASIC 0.85V Rail_1 T0_1 Pwr (out)"
label power4 "PMIC-3 ASIC 1.8V Rail_2 T0_1 Pwr (out)"
label curr1 "PMIC-3 ASIC 12V Rail_1 Curr (in)"
label curr2 "PMIC-3 ASIC 12V Rail_2 Curr (in)"
label curr3 "PMIC-3 ASIC 0.85V Rail_1 T0_1 Curr (out)"
label curr4 "PMIC-3 ASIC 1.8V Rail_2 T0_1 Curr (out)"
chip "xdpe12284-i2c-*-68"
label in1 "PMIC-4 PSU 12V Rail_1 (in)"
label in2 "PMIC-4 PSU 12V Rail_2 (in)"
label in3 "PMIC-4 ASIC 0.85V Rail_1 T2_3 (out)"
label in4 "PMIC-4 ASIC 1.8V Rail_2 T2_3 (out)"
label power1 "PMIC-3 PSU 12V Rail Pwr (in1)"
label power2 "PMIC-3 ASIC 0.85V T0_1 Rail Pwr (out)"
label curr1 "PMIC-3 PSU 12V Rail Curr (in1)"
label curr2 "PMIC-3 ASIC 0.85V T0_1 Rail Curr (out)"
label curr3 "PMIC-3 ASIC 1.8V T0_1 Rail Curr (out)"
chip "mp2975-i2c-*-6a"
label in1 "PMIC-4 PSU 12V Rail (in1)"
label in2 "PMIC-4 ASIC 0.85V T2_3 Rail (out)"
label in3 "PMIC-4 ASIC 1.8V T2_3 Rail (out)"
label temp1 "PMIC-4 Temp 1"
label temp2 "PMIC-4 Temp 2"
label power1 "PMIC-4 ASIC 12V Rail_1 Pwr (in)"
label power2 "PMIC-4 ASIC 12V Rail_2 Pwr (in)"
label power3 "PMIC-4 ASIC 0.85V Rail_1 T2_3 Pwr (out)"
label power4 "PMIC-4 ASIC 1.8V Rail_2 T2_3 Pwr (out)"
label curr1 "PMIC-4 ASIC 12V Rail_1 Curr (in)"
label curr2 "PMIC-4 ASIC 12V Rail_2 Curr (in)"
label curr3 "PMIC-4 ASIC 0.85V Rail_1 T2_3 Curr (out)"
label curr4 "PMIC-4 ASIC 1.8V Rail_2 T2_3 Curr (out)"
chip "xdpe12284-i2c-*-6a"
label in1 "PMIC-5 PSU 12V Rail_1 (in)"
label in2 "PMIC-5 PSU 12V Rail_2 (in)"
label in3 "PMIC-5 ASIC 0.85V Rail_1 T4_5 (out)"
label in4 "PMIC-5 ASIC 1.8V Rail_2 T4_5 (out)"
label power1 "PMIC-4 PSU 12V Rail Pwr (in1)"
label power2 "PMIC-4 ASIC 0.85V T2_3 Rail Pwr (out)"
label curr1 "PMIC-4 PSU 12V Rail Curr (in1)"
label curr2 "PMIC-4 ASIC 0.85V T2_3 Rail Curr (out)"
label curr3 "PMIC-4 ASIC 1.8V T2_3 Rail Curr (out)"
chip "mp2975-i2c-*-6e"
label in1 "PMIC-5 PSU 12V Rail (in1)"
label in2 "PMIC-5 ASIC 1.2V T0_3 Rail_1 (out)"
label in3 "PMIC-5 ASIC 1.2V T4_7 Rail_2 (out)"
label temp1 "PMIC-5 Temp 1"
label temp2 "PMIC-5 Temp 2"
label power1 "PMIC-5 ASIC 12V Rail_1 Pwr (in)"
label power2 "PMIC-5 ASIC 12V Rail_2 Pwr (in)"
label power3 "PMIC-5 ASIC 0.85V Rail_1 T4_5 Pwr (out)"
label power4 "PMIC-5 ASIC 1.8V Rail_2 T4_5 Pwr (out)"
label curr1 "PMIC-5 ASIC 12V Rail_1 Curr (in)"
label curr2 "PMIC-5 ASIC 12V Rail_2 Curr (in)"
label curr3 "PMIC-5 ASIC 0.85V Rail_1 T4_5 Curr (out)"
label curr4 "PMIC-5 ASIC 1.8V Rail_2 T4_5 Curr (out)"
chip "xdpe12284-i2c-*-6c"
label in1 "PMIC-6 PSU 12V Rail_1 (in)"
label in2 "PMIC-6 PSU 12V Rail_2 (in)"
label in3 "PMIC-6 ASIC 0.85V Rail_1 T6_7 (out)"
label in4 "PMIC-6 ASIC 1.8V Rail_2 T6_7 (out)"
label temp1 "PMIC-6 Temp 1"
label temp2 "PMIC-6 Temp 2"
label power1 "PMIC-6 ASIC 12V Rail_1 Pwr (in)"
label power2 "PMIC-6 ASIC 12V Rail_2 Pwr (in)"
label power3 "PMIC-6 ASIC 0.85V Rail_1 T6_7 Pwr (out)"
label power4 "PMIC-6 ASIC 1.8V Rail_2 T6_7 Pwr (out)"
label curr1 "PMIC-6 ASIC 12V Rail_1 Curr (in)"
label curr2 "PMIC-6 ASIC 12V Rail_2 Curr (in)"
label curr3 "PMIC-6 ASIC 0.85V Rail_1 T6_7 Curr (out)"
label curr4 "PMIC-6 ASIC 1.8V Rail_2 T6_7 Curr (out)"
chip "xdpe12284-i2c-*-6e"
label in1 "PMIC-7 PSU 12V Rail_1 (in)"
label in2 "PMIC-7 PSU 12V Rail_2 (in)"
label in3 "PMIC-7 ASIC 1.2V Rail_1 T0_3 (out)"
label in4 "PMIC-7 ASIC 1.2V Rail_2 T4_7 (out)"
label temp1 "PMIC-7 Temp 1"
label temp2 "PMIC-7 Temp 2"
label power1 "PMIC-7 ASIC 12V Rail_1 Pwr (in)"
label power2 "PMIC-7 ASIC 12V Rail_2 Pwr (in)"
label power3 "PMIC-7 ASIC 1.2V Rail_1 T0_3 Pwr (out)"
label power4 "PMIC-7 ASIC 1.2V Rail_2 T4_7 Pwr (out)"
label curr1 "PMIC-7 ASIC 12V Rail_1 Curr (in)"
label curr2 "PMIC-7 ASIC 12V Rail_2 Curr (in)"
label curr3 "PMIC-7 ASIC 1.2V Rail_1 T0_3 Curr (out)"
label curr4 "PMIC-7 ASIC 1.2V Rail_2 T4_7 Curr (out)"
label power1 "PMIC-5 PSU 12V Rail Pwr (in1)"
label power2 "PMIC-5 ASIC 1.2V T0_3 Rail_1 Pwr (out)"
label power3 "PMIC-5 ASIC 1.2V T4_7 Rail_2 Pwr (out)"
label curr1 "PMIC-5 PSU 12V Rail Curr (in1)"
label curr2 "PMIC-5 ASIC 1.2V T0_3 Rail_1 Curr (out)"
label curr3 "PMIC-5 ASIC 1.2V T4_7 Rail_2 Curr (out)"

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 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 in1 "PMIC-6 PSU 12V Rail (in1)"
label in2 "PMIC-6 PSU 12V Rail (in2)"
label in3 "PMIC-6 COMEX 1.8V Rail (out)"
label in4 "PMIC-6 COMEX 1.05V Rail (out)"
label temp1 "PMIC-6 Temp 1"
label temp2 "PMIC-6 Temp 2"
label power1 "PMIC-6 COMEX 1.8V Rail Pwr (out)"
label power2 "PMIC-6 COMEX 1.05V Rail Pwr (out)"
label curr1 "PMIC-6 COMEX 1.8V Rail Curr (out)"
label curr2 "PMIC-6 COMEX 1.05V Rail Curr (out)"
chip "tps53679-i2c-*-61"
label in1 "PMIC-9 PSU 12V Rail (in1)"
label in2 "PMIC-9 PSU 12V Rail (in2)"
label in3 "PMIC-9 COMEX 1.2V Rail (out)"
label in1 "PMIC-7 PSU 12V Rail (in1)"
label in2 "PMIC-7 PSU 12V Rail (in2)"
label in3 "PMIC-7 COMEX 1.2V Rail (out)"
ignore in4
label temp1 "PMIC-9 Temp 1"
label temp2 "PMIC-9 Temp 2"
label power1 "PMIC-9 COMEX 1.2V Rail Pwr (out)"
label temp1 "PMIC-7 Temp 1"
label temp2 "PMIC-7 Temp 2"
label power1 "PMIC-7 COMEX 1.2V Rail Pwr (out)"
ignore power2
label curr1 "PMIC-9 COMEX 1.2V Rail Curr (out)"
label curr1 "PMIC-7 COMEX 1.2V Rail Curr (out)"
ignore curr2

# Power supplies
Expand Down
133 changes: 0 additions & 133 deletions device/mellanox/x86_64-mlnx_msn4600-r0/sensors.conf.a1
View file

This file was deleted.

0 comments on commit 17d0dc3

Please sign in to comment.