Skip to content

[PDDF] Rename temp for as7816/7326/7726 #10609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
prgeor merged 2 commits into from
May 9, 2022
Merged

[PDDF] Rename temp for as7816/7326/7726 #10609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9def611
[PDDF] Rename temp for 7816/7326/7726
Apr 19, 2022
304da67
Change naming to pddf device
Apr 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions device/accton/x86_64-accton_as7326_56x-r0/pddf/pddf-device.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@
"TEMP1" :
{
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP1", "device_parent":"MUX2"},
"dev_attr": { "display_name":"MB_RearMAC_temp(0x48)"},
"i2c":
{
"topo_info": { "parent_bus":"0xf", "dev_addr":"0x48", "dev_type":"lm75"},
Expand All @@ -316,7 +317,8 @@
},
"TEMP2" :
{
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP1", "device_parent":"MUX2"},
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP2", "device_parent":"MUX2"},
"dev_attr": { "display_name":"MB_FrontMAC_temp(0x49)"},
"i2c":
{
"topo_info": { "parent_bus":"0xf", "dev_addr":"0x49", "dev_type":"lm75"},
Expand All @@ -330,7 +332,8 @@
},
"TEMP3" :
{
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP1", "device_parent":"MUX2"},
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP3", "device_parent":"MUX2"},
"dev_attr": { "display_name":"MB_LeftCenter_temp(0x4A)"},
"i2c":
{
"topo_info": { "parent_bus":"0xf", "dev_addr":"0x4A", "dev_type":"lm75"},
Expand All @@ -344,7 +347,8 @@
},
"TEMP4" :
{
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP1", "device_parent":"MUX2"},
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP4", "device_parent":"MUX2"},
"dev_attr": { "display_name":"CB_temp(0x4B)"},
"i2c":
{
"topo_info": { "parent_bus":"0xf", "dev_addr":"0x4B", "dev_type":"lm75"},
Expand Down
42 changes: 19 additions & 23 deletions device/accton/x86_64-accton_as7326_56x-r0/sensors.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,46 @@
# libsensors configuration file for as7326-56x
# ------------------------------------------------
#

bus "i2c-11" "i2c-1-mux (chan_id 2)"
bus "i2c-13" "i2c-1-mux (chan_id 4)"
bus "i2c-15" "i2c-1-mux (chan_id 6)"
bus "i2c-17" "i2c-1-mux (chan_id 0)"


chip "ym2651-i2c-*-59"
chip "psu_pmbus-i2c-*-59"
label in3 "PSU 1 Voltage"
label fan1 "PSU 1 Fan"
label temp1 "PSU 1 Temperature"
label power2 "PSU 1 Power"
label curr2 "PSU 1 Current"

chip "ym2651-i2c-*-5b"
chip "psu_pmbus-i2c-*-5b"
label in3 "PSU 2 Voltage"
label fan1 "PSU 2 Fan"
label temp1 "PSU 2 Temperature"
label power2 "PSU 2 Power"
label curr2 "PSU 2 Current"

chip "as7326_56x_fan-*"
label fan1 "Fan 1 Front"
label fan2 "Fan 2 Front"
label fan3 "Fan 3 Front"
label fan4 "Fan 4 Front"
label fan5 "Fan 5 Front"
label fan6 "Fan 6 Front"
label fan11 "Fan 1 Rear"
label fan12 "Fan 2 Rear"
label fan13 "Fan 3 Rear"
label fan14 "Fan 4 Rear"
label fan15 "Fan 5 Rear"
label fan16 "Fan 6 Rear"
chip "fan_ctrl-*"
label fan1 "Fantray1 Front"
label fan2 "Fantray1 Rear"
label fan3 "Fantray2 Front"
label fan4 "Fantray2 Rear"
label fan5 "Fantray3 Front"
label fan6 "Fantray3 Rear"
label fan7 "Fantray4 Front"
label fan8 "Fantray4 Rear"
label fan9 "Fantray5 Front"
label fan10 "Fantray5 Rear"
label fan11 "Fantray6 Front"
label fan12 "Fantray6 Rear"


chip "lm75-i2c-*-48"
label temp1 "Main Board Temperature"
label temp1 "MB_RearMAC_temp"

chip "lm75-i2c-*-49"
label temp1 "Main Board Temperature"
label temp1 "MB_FrontMAC_temp"

chip "lm75-i2c-*-4a"
label temp1 "Main Board Temperature"
label temp1 "MB_LeftCenter_temp"

chip "lm75-i2c-*-4b"
label temp1 "CPU Board Temperature"
label temp1 "CB_temp"
5 changes: 5 additions & 0 deletions device/accton/x86_64-accton_as7726_32x-r0/pddf/pddf-device.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1789,6 +1789,7 @@
"TEMP1" :
{
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP1", "device_parent":"MUX7"},
"dev_attr": { "display_name":"FB_temp(0x4C)"},
"i2c":
{
"topo_info": { "parent_bus":"0x36", "dev_addr":"0x4c", "dev_type":"lm75"},
Expand All @@ -1804,6 +1805,7 @@
"TEMP2" :
{
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP2", "device_parent":"MUX7"},
"dev_attr": { "display_name":"MB_RearMAC_temp(0x48)"},
"i2c":
{
"topo_info": { "parent_bus":"0x37", "dev_addr":"0x48", "dev_type":"lm75"},
Expand All @@ -1819,6 +1821,7 @@
"TEMP3" :
{
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP3", "device_parent":"MUX7"},
"dev_attr": { "display_name":"MB_FrontMAC_temp(0x49)"},
"i2c":
{
"topo_info": { "parent_bus":"0x37", "dev_addr":"0x49", "dev_type":"lm75"},
Expand All @@ -1834,6 +1837,7 @@
"TEMP4" :
{
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP4", "device_parent":"MUX7"},
"dev_attr": { "display_name":"MB_LeftCenter_temp(0x4A)"},
"i2c":
{
"topo_info": { "parent_bus":"0x37", "dev_addr":"0x4a", "dev_type":"lm75"},
Expand All @@ -1849,6 +1853,7 @@
"TEMP5" :
{
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP5", "device_parent":"MUX7"},
"dev_attr": { "display_name":"CB_temp(0x4B)"},
"i2c":
{
"topo_info": { "parent_bus":"0x37", "dev_addr":"0x4b", "dev_type":"lm75"},
Expand Down
52 changes: 26 additions & 26 deletions device/accton/x86_64-accton_as7726_32x-r0/sensors.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,49 @@
# libsensors configuration file for as7726-32x
# ------------------------------------------------
#

bus "i2c-49" "i2c-2-mux (chan_id 0)"
bus "i2c-50" "i2c-2-mux (chan_id 1)"
bus "i2c-54" "i2c-2-mux (chan_id 5)"
bus "i2c-55" "i2c-2-mux (chan_id 6)"


chip "ym2651-i2c-*-5b"
chip "psu_pmbus-i2c-*-5b"
label in3 "PSU 1 Voltage"
label fan1 "PSU 1 Fan"
label temp1 "PSU 1 Temperature"
label power1 "PSU 1 Power"

chip "ym2651-i2c-*-58"
label power2 "PSU 1 Power"
label curr2 "PSU 1 Current"
chip "psu_pmbus-i2c-*-58"
label in3 "PSU 2 Voltage"
label fan1 "PSU 2 Fan"
label temp1 "PSU 2 Temperature"
label power1 "PSU 2 Power"

chip "as7726_32x_fan-*"
label fan1 "Fan 1 Front"
label fan2 "Fan 2 Front"
label fan3 "Fan 3 Front"
label fan4 "Fan 4 Front"
label fan5 "Fan 5 Front"
label fan6 "Fan 6 Front"
label fan11 "Fan 1 Rear"
label fan12 "Fan 2 Rear"
label fan13 "Fan 3 Rear"
label fan14 "Fan 4 Rear"
label fan15 "Fan 5 Rear"
label fan16 "Fan 6 Rear"
label power2 "PSU 2 Power"
label curr2 "PSU 2 Current"
chip "fan_ctrl-*"
label fan1 "Fantray1 Front"
label fan2 "Fantray1 Rear"
label fan3 "Fantray2 Front"
label fan4 "Fantray2 Rear"
label fan5 "Fantray3 Front"
label fan6 "Fantray3 Rear"
label fan7 "Fantray4 Front"
label fan8 "Fantray4 Rear"
label fan9 "Fantray5 Front"
label fan10 "Fantray5 Rear"
label fan11 "Fantray6 Front"
label fan12 "Fantray6 Rear"


chip "lm75-i2c-*-48"
label temp1 "Main Board Temperature"
label temp1 "MB_RearMAC_temp"

chip "lm75-i2c-*-49"
label temp1 "Main Board Temperature"
label temp1 "MB_FrontMAC_temp"

chip "lm75-i2c-*-4a"
label temp1 "Main Board Temperature"
label temp1 "MB_LeftCenter_temp"

chip "lm75-i2c-*-4b"
label temp1 "CPU Board Temperature"
label temp1 "CB_temp"

chip "lm75-i2c-*-4c"
label temp1 "Fan Board Temperature"
label temp1 "FB_temp"
12 changes: 6 additions & 6 deletions device/accton/x86_64-accton_as7816_64x-r0/pddf/pddf-device.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@
"TEMP1" :
{
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP1", "device_parent":"MUX3"},
"dev_attr": { "display_name":"Temp_1"},
"dev_attr": { "display_name":"FB_1_temp(0x4D)"},
"i2c":
{
"topo_info": { "parent_bus":"0x11", "dev_addr":"0x4D", "dev_type":"lm75"},
Expand All @@ -334,7 +334,7 @@
"TEMP2" :
{
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP2", "device_parent":"MUX3"},
"dev_attr": { "display_name":"Temp_2"},
"dev_attr": { "display_name":"FB_2_temp(0x4E)"},
"i2c":
{
"topo_info": { "parent_bus":"0x11", "dev_addr":"0x4E", "dev_type":"lm75"},
Expand All @@ -349,7 +349,7 @@
"TEMP3" :
{
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP3", "device_parent":"MUX3"},
"dev_attr": { "display_name":"Temp_3"},
"dev_attr": { "display_name":"MB_MAC_temp(0x48)"},
"i2c":
{
"topo_info": { "parent_bus":"0x12", "dev_addr":"0x48", "dev_type":"lm75"},
Expand All @@ -364,7 +364,7 @@
"TEMP4" :
{
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP4", "device_parent":"MUX3"},
"dev_attr": { "display_name":"Temp_4"},
"dev_attr": { "display_name":"MB_RearCenter_temp(0x49)"},
"i2c":
{
"topo_info": { "parent_bus":"0x12", "dev_addr":"0x49", "dev_type":"lm75"},
Expand All @@ -379,7 +379,7 @@
"TEMP5" :
{
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP5", "device_parent":"MUX3"},
"dev_attr": { "display_name":"Temp_5"},
"dev_attr": { "display_name":"MB_RightCenter_temp(0x4A)"},
"i2c":
{
"topo_info": { "parent_bus":"0x12", "dev_addr":"0x4A", "dev_type":"lm75"},
Expand All @@ -394,7 +394,7 @@
"TEMP6" :
{
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP6", "device_parent":"MUX3"},
"dev_attr": { "display_name":"Temp_6"},
"dev_attr": { "display_name":"CpuBoard_temp(0x4B)"},
"i2c":
{
"topo_info": { "parent_bus":"0x12", "dev_addr":"0x4B", "dev_type":"lm75"},
Expand Down
39 changes: 17 additions & 22 deletions device/accton/x86_64-accton_as7816_64x-r0/sensors.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,46 @@
# libsensors configuration file for as7816-64x
# ------------------------------------------------
#

bus "i2c-9" "i2c-1-mux (chan_id 0)"
bus "i2c-10" "i2c-1-mux (chan_id 1)"
bus "i2c-17" "i2c-1-mux (chan_id 0)"
bus "i2c-18" "i2c-1-mux (chan_id 1)"


chip "ym2851-i2c-*-5b"
chip "psu_pmbus-i2c-*-5b"
label in3 "PSU 1 Voltage"
label fan1 "PSU 1 Fan"
label temp1 "PSU 1 Temperature"
label power2 "PSU 1 Power"
label curr2 "PSU 1 Current"

chip "ym2851-i2c-*-58"
chip "psu_pmbus-i2c-*-58"
label in3 "PSU 2 Voltage"
label fan1 "PSU 2 Fan"
label temp1 "PSU 2 Temperature"
label power2 "PSU 2 Power"
label curr2 "PSU 2 Current"

chip "as7816_64x_fan-*"
label fan1 "Fan 1 Front"
label fan2 "Fan 2 Front"
label fan3 "Fan 3 Front"
label fan4 "Fan 4 Front"
label fan11 "Fan 1 Rear"
label fan12 "Fan 2 Rear"
label fan13 "Fan 3 Rear"
label fan14 "Fan 4 Rear"
chip "fan_ctrl-*"
label fan1 "Fantray1 Front"
label fan2 "Fantray1 Rear"
label fan3 "Fantray2 Front"
label fan4 "Fantray2 Rear"
label fan5 "Fantray3 Front"
label fan6 "Fantray3 Rear"
label fan7 "Fantray4 Front"
label fan8 "Fantray4 Rear"

chip "lm75-i2c-*-48"
label temp1 "Main Board Temperature"
label temp1 "MB_MAC_temp"

chip "lm75-i2c-*-49"
label temp1 "Main Board Temperature"
label temp1 "MB_RearCenter_temp"

chip "lm75-i2c-*-4a"
label temp1 "Main Board Temperature"
label temp1 "MB_RightCenter_temp"

chip "lm75-i2c-*-4b"
label temp1 "CPU Board Temperature"
label temp1 "CpuBoard_temp"

chip "lm75-i2c-*-4d"
label temp1 "Fan Board Temperature"
label temp1 "FB_1_temp"

chip "lm75-i2c-*-4e"
label temp1 "Fan Board Temperature"
label temp1 "FB_2_temp"