From 9b08a9e14eae28a91924a4c430b226b31424ed7b Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Mon, 18 Jul 2022 11:49:51 -0700 Subject: [PATCH 1/2] Update sensor names for msn4600c for the 5.10 kernel Looks like a sensor was removed in the 5.10 kernel for the tps53679 sensor, so the names/indexing has changed. Related to Azure/sonic-mgmt#4513. Signed-off-by: Saikrishna Arcot --- device/mellanox/x86_64-mlnx_msn4600c-r0/sensors.conf | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/sensors.conf b/device/mellanox/x86_64-mlnx_msn4600c-r0/sensors.conf index 3ff78f15023..3993d1c35b5 100644 --- a/device/mellanox/x86_64-mlnx_msn4600c-r0/sensors.conf +++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/sensors.conf @@ -130,9 +130,8 @@ 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-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 in2 "PMIC-8 COMEX 1.8V Rail (out)" + label in3 "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)" @@ -141,9 +140,8 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)" label curr2 "PMIC-8 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)" - ignore in4 + label in2 "PMIC-9 COMEX 1.2V Rail (out)" + ignore in3 label temp1 "PMIC-9 Temp 1" label temp2 "PMIC-9 Temp 2" label power1 "PMIC-9 COMEX 1.2V Rail Pwr (out)" From acaea225e5e798b3dda13e52e2cc660f56cddf51 Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Thu, 18 Aug 2022 16:50:56 -0700 Subject: [PATCH 2/2] Update sensors file Signed-off-by: Saikrishna Arcot --- .../x86_64-mlnx_msn4600c-r0/sensors.conf | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/sensors.conf b/device/mellanox/x86_64-mlnx_msn4600c-r0/sensors.conf index 3993d1c35b5..b0ad1ff407b 100644 --- a/device/mellanox/x86_64-mlnx_msn4600c-r0/sensors.conf +++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/sensors.conf @@ -129,25 +129,29 @@ 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-8 PSU 12V Rail (in1)" + label in1 "PMIC-8 PSU 12V Rail (in)" 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 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)" + ignore power1 + label power2 "PMIC-8 COMEX 1.8V Rail Pwr (out)" + label power3 "PMIC-8 COMEX 1.05V Rail Pwr (out)" + ignore curr1 + label curr2 "PMIC-8 COMEX 1.8V Rail Curr (out)" + label curr3 "PMIC-8 COMEX 1.05V Rail Curr (out)" chip "tps53679-i2c-*-61" - label in1 "PMIC-9 PSU 12V Rail (in1)" + label in1 "PMIC-9 PSU 12V Rail (in)" label in2 "PMIC-9 COMEX 1.2V Rail (out)" ignore in3 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 + ignore power1 + label power2 "PMIC-9 COMEX 1.2V Rail Pwr (out)" + ignore power3 + ignore curr1 + label curr2 "PMIC-9 COMEX 1.2V Rail Curr (out)" + ignore curr3 # Power supplies bus "i2c-4" "i2c-1-mux (chan_id 3)"