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

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

Browse Source 
* [PDDF] Rename temp for 7816/7326/7726

Signed-off-by: Jostar Yang <jostar_yang@accton.com.tw>

* Change naming to pddf device

Co-authored-by: Jostar Yang <jostar_yang@accton.com.tw>
This commit is contained in:
jostar-yang 2022-05-10 01:47:45 +08:00 committed by GitHub
parent 15cf9b0d70
commit b86499ccb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
device/accton/x86_64-accton_as7326_56x-r0/pddf/pddf-device.json
View File

@ -303,6 +303,7 @@
"TEMP1" : "TEMP1" :
{ {
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP1", "device_parent":"MUX2"}, "dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP1", "device_parent":"MUX2"},
"dev_attr": { "display_name":"MB_RearMAC_temp(0x48)"},
"i2c": "i2c":
{ {
"topo_info": { "parent_bus":"0xf", "dev_addr":"0x48", "dev_type":"lm75"}, "topo_info": { "parent_bus":"0xf", "dev_addr":"0x48", "dev_type":"lm75"},
@ -316,7 +317,8 @@
}, },
"TEMP2" : "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": "i2c":
{ {
"topo_info": { "parent_bus":"0xf", "dev_addr":"0x49", "dev_type":"lm75"}, "topo_info": { "parent_bus":"0xf", "dev_addr":"0x49", "dev_type":"lm75"},
@ -330,7 +332,8 @@
}, },
"TEMP3" : "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": "i2c":
{ {
"topo_info": { "parent_bus":"0xf", "dev_addr":"0x4A", "dev_type":"lm75"}, "topo_info": { "parent_bus":"0xf", "dev_addr":"0x4A", "dev_type":"lm75"},
@ -344,7 +347,8 @@
}, },
"TEMP4" : "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": "i2c":
{ {
"topo_info": { "parent_bus":"0xf", "dev_addr":"0x4B", "dev_type":"lm75"}, "topo_info": { "parent_bus":"0xf", "dev_addr":"0x4B", "dev_type":"lm75"},

42
device/accton/x86_64-accton_as7326_56x-r0/sensors.conf
View File

@ -1,50 +1,46 @@
# libsensors configuration file for as7326-56x # libsensors configuration file for as7326-56x
# ------------------------------------------------ # ------------------------------------------------
# #
bus "i2c-11" "i2c-1-mux (chan_id 2)" bus "i2c-11" "i2c-1-mux (chan_id 2)"
bus "i2c-13" "i2c-1-mux (chan_id 4)" bus "i2c-13" "i2c-1-mux (chan_id 4)"
bus "i2c-15" "i2c-1-mux (chan_id 6)" bus "i2c-15" "i2c-1-mux (chan_id 6)"
bus "i2c-17" "i2c-1-mux (chan_id 0)" bus "i2c-17" "i2c-1-mux (chan_id 0)"
chip "psu_pmbus-i2c-*-59"
chip "ym2651-i2c-*-59"
label in3 "PSU 1 Voltage" label in3 "PSU 1 Voltage"
label fan1 "PSU 1 Fan" label fan1 "PSU 1 Fan"
label temp1 "PSU 1 Temperature" label temp1 "PSU 1 Temperature"
label power2 "PSU 1 Power" label power2 "PSU 1 Power"
label curr2 "PSU 1 Current" label curr2 "PSU 1 Current"
chip "psu_pmbus-i2c-*-5b"
chip "ym2651-i2c-*-5b"
label in3 "PSU 2 Voltage" label in3 "PSU 2 Voltage"
label fan1 "PSU 2 Fan" label fan1 "PSU 2 Fan"
label temp1 "PSU 2 Temperature" label temp1 "PSU 2 Temperature"
label power2 "PSU 2 Power" label power2 "PSU 2 Power"
label curr2 "PSU 2 Current" label curr2 "PSU 2 Current"
chip "fan_ctrl-*"
chip "as7326_56x_fan-*" label fan1 "Fantray1 Front"
label fan1 "Fan 1 Front" label fan2 "Fantray1 Rear"
label fan2 "Fan 2 Front" label fan3 "Fantray2 Front"
label fan3 "Fan 3 Front" label fan4 "Fantray2 Rear"
label fan4 "Fan 4 Front" label fan5 "Fantray3 Front"
label fan5 "Fan 5 Front" label fan6 "Fantray3 Rear"
label fan6 "Fan 6 Front" label fan7 "Fantray4 Front"
label fan11 "Fan 1 Rear" label fan8 "Fantray4 Rear"
label fan12 "Fan 2 Rear" label fan9 "Fantray5 Front"
label fan13 "Fan 3 Rear" label fan10 "Fantray5 Rear"
label fan14 "Fan 4 Rear" label fan11 "Fantray6 Front"
label fan15 "Fan 5 Rear" label fan12 "Fantray6 Rear"
label fan16 "Fan 6 Rear"
chip "lm75-i2c-*-48" chip "lm75-i2c-*-48"
label temp1 "Main Board Temperature" label temp1 "MB_RearMAC_temp"
chip "lm75-i2c-*-49" chip "lm75-i2c-*-49"
label temp1 "Main Board Temperature" label temp1 "MB_FrontMAC_temp"
chip "lm75-i2c-*-4a" chip "lm75-i2c-*-4a"
label temp1 "Main Board Temperature" label temp1 "MB_LeftCenter_temp"
chip "lm75-i2c-*-4b" chip "lm75-i2c-*-4b"
label temp1 "CPU Board Temperature" label temp1 "CB_temp"

5
device/accton/x86_64-accton_as7726_32x-r0/pddf/pddf-device.json
View File

@ -1789,6 +1789,7 @@
"TEMP1" : "TEMP1" :
{ {
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP1", "device_parent":"MUX7"}, "dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP1", "device_parent":"MUX7"},
"dev_attr": { "display_name":"FB_temp(0x4C)"},
"i2c": "i2c":
{ {
"topo_info": { "parent_bus":"0x36", "dev_addr":"0x4c", "dev_type":"lm75"}, "topo_info": { "parent_bus":"0x36", "dev_addr":"0x4c", "dev_type":"lm75"},
@ -1804,6 +1805,7 @@
"TEMP2" : "TEMP2" :
{ {
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP2", "device_parent":"MUX7"}, "dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP2", "device_parent":"MUX7"},
"dev_attr": { "display_name":"MB_RearMAC_temp(0x48)"},
"i2c": "i2c":
{ {
"topo_info": { "parent_bus":"0x37", "dev_addr":"0x48", "dev_type":"lm75"}, "topo_info": { "parent_bus":"0x37", "dev_addr":"0x48", "dev_type":"lm75"},
@ -1819,6 +1821,7 @@
"TEMP3" : "TEMP3" :
{ {
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP3", "device_parent":"MUX7"}, "dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP3", "device_parent":"MUX7"},
"dev_attr": { "display_name":"MB_FrontMAC_temp(0x49)"},
"i2c": "i2c":
{ {
"topo_info": { "parent_bus":"0x37", "dev_addr":"0x49", "dev_type":"lm75"}, "topo_info": { "parent_bus":"0x37", "dev_addr":"0x49", "dev_type":"lm75"},
@ -1834,6 +1837,7 @@
"TEMP4" : "TEMP4" :
{ {
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP4", "device_parent":"MUX7"}, "dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP4", "device_parent":"MUX7"},
"dev_attr": { "display_name":"MB_LeftCenter_temp(0x4A)"},
"i2c": "i2c":
{ {
"topo_info": { "parent_bus":"0x37", "dev_addr":"0x4a", "dev_type":"lm75"}, "topo_info": { "parent_bus":"0x37", "dev_addr":"0x4a", "dev_type":"lm75"},
@ -1849,6 +1853,7 @@
"TEMP5" : "TEMP5" :
{ {
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP5", "device_parent":"MUX7"}, "dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP5", "device_parent":"MUX7"},
"dev_attr": { "display_name":"CB_temp(0x4B)"},
"i2c": "i2c":
{ {
"topo_info": { "parent_bus":"0x37", "dev_addr":"0x4b", "dev_type":"lm75"}, "topo_info": { "parent_bus":"0x37", "dev_addr":"0x4b", "dev_type":"lm75"},

52
device/accton/x86_64-accton_as7726_32x-r0/sensors.conf
View File

@ -1,49 +1,49 @@
# libsensors configuration file for as7726-32x # libsensors configuration file for as7726-32x
# ------------------------------------------------ # ------------------------------------------------
# #
bus "i2c-49" "i2c-2-mux (chan_id 0)" bus "i2c-49" "i2c-2-mux (chan_id 0)"
bus "i2c-50" "i2c-2-mux (chan_id 1)" bus "i2c-50" "i2c-2-mux (chan_id 1)"
bus "i2c-54" "i2c-2-mux (chan_id 5)" bus "i2c-54" "i2c-2-mux (chan_id 5)"
bus "i2c-55" "i2c-2-mux (chan_id 6)" bus "i2c-55" "i2c-2-mux (chan_id 6)"
chip "psu_pmbus-i2c-*-5b"
chip "ym2651-i2c-*-5b" label in3 "PSU 1 Voltage"
label fan1 "PSU 1 Fan" label fan1 "PSU 1 Fan"
label temp1 "PSU 1 Temperature" label temp1 "PSU 1 Temperature"
label power1 "PSU 1 Power" label power2 "PSU 1 Power"
label curr2 "PSU 1 Current"
chip "ym2651-i2c-*-58" chip "psu_pmbus-i2c-*-58"
label in3 "PSU 2 Voltage"
label fan1 "PSU 2 Fan" label fan1 "PSU 2 Fan"
label temp1 "PSU 2 Temperature" label temp1 "PSU 2 Temperature"
label power1 "PSU 2 Power" label power2 "PSU 2 Power"
label curr2 "PSU 2 Current"
chip "as7726_32x_fan-*" chip "fan_ctrl-*"
label fan1 "Fan 1 Front" label fan1 "Fantray1 Front"
label fan2 "Fan 2 Front" label fan2 "Fantray1 Rear"
label fan3 "Fan 3 Front" label fan3 "Fantray2 Front"
label fan4 "Fan 4 Front" label fan4 "Fantray2 Rear"
label fan5 "Fan 5 Front" label fan5 "Fantray3 Front"
label fan6 "Fan 6 Front" label fan6 "Fantray3 Rear"
label fan11 "Fan 1 Rear" label fan7 "Fantray4 Front"
label fan12 "Fan 2 Rear" label fan8 "Fantray4 Rear"
label fan13 "Fan 3 Rear" label fan9 "Fantray5 Front"
label fan14 "Fan 4 Rear" label fan10 "Fantray5 Rear"
label fan15 "Fan 5 Rear" label fan11 "Fantray6 Front"
label fan16 "Fan 6 Rear" label fan12 "Fantray6 Rear"
chip "lm75-i2c-*-48" chip "lm75-i2c-*-48"
label temp1 "Main Board Temperature" label temp1 "MB_RearMAC_temp"
chip "lm75-i2c-*-49" chip "lm75-i2c-*-49"
label temp1 "Main Board Temperature" label temp1 "MB_FrontMAC_temp"
chip "lm75-i2c-*-4a" chip "lm75-i2c-*-4a"
label temp1 "Main Board Temperature" label temp1 "MB_LeftCenter_temp"
chip "lm75-i2c-*-4b" chip "lm75-i2c-*-4b"
label temp1 "CPU Board Temperature" label temp1 "CB_temp"
chip "lm75-i2c-*-4c" chip "lm75-i2c-*-4c"
label temp1 "Fan Board Temperature" label temp1 "FB_temp"

12
device/accton/x86_64-accton_as7816_64x-r0/pddf/pddf-device.json
View File

@ -319,7 +319,7 @@
"TEMP1" : "TEMP1" :
{ {
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP1", "device_parent":"MUX3"}, "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": "i2c":
{ {
"topo_info": { "parent_bus":"0x11", "dev_addr":"0x4D", "dev_type":"lm75"}, "topo_info": { "parent_bus":"0x11", "dev_addr":"0x4D", "dev_type":"lm75"},
@ -334,7 +334,7 @@
"TEMP2" : "TEMP2" :
{ {
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP2", "device_parent":"MUX3"}, "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": "i2c":
{ {
"topo_info": { "parent_bus":"0x11", "dev_addr":"0x4E", "dev_type":"lm75"}, "topo_info": { "parent_bus":"0x11", "dev_addr":"0x4E", "dev_type":"lm75"},
@ -349,7 +349,7 @@
"TEMP3" : "TEMP3" :
{ {
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP3", "device_parent":"MUX3"}, "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": "i2c":
{ {
"topo_info": { "parent_bus":"0x12", "dev_addr":"0x48", "dev_type":"lm75"}, "topo_info": { "parent_bus":"0x12", "dev_addr":"0x48", "dev_type":"lm75"},
@ -364,7 +364,7 @@
"TEMP4" : "TEMP4" :
{ {
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP4", "device_parent":"MUX3"}, "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": "i2c":
{ {
"topo_info": { "parent_bus":"0x12", "dev_addr":"0x49", "dev_type":"lm75"}, "topo_info": { "parent_bus":"0x12", "dev_addr":"0x49", "dev_type":"lm75"},
@ -379,7 +379,7 @@
"TEMP5" : "TEMP5" :
{ {
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP5", "device_parent":"MUX3"}, "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": "i2c":
{ {
"topo_info": { "parent_bus":"0x12", "dev_addr":"0x4A", "dev_type":"lm75"}, "topo_info": { "parent_bus":"0x12", "dev_addr":"0x4A", "dev_type":"lm75"},
@ -394,7 +394,7 @@
"TEMP6" : "TEMP6" :
{ {
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP6", "device_parent":"MUX3"}, "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": "i2c":
{ {
"topo_info": { "parent_bus":"0x12", "dev_addr":"0x4B", "dev_type":"lm75"}, "topo_info": { "parent_bus":"0x12", "dev_addr":"0x4B", "dev_type":"lm75"},

39
device/accton/x86_64-accton_as7816_64x-r0/sensors.conf
View File

@ -1,51 +1,46 @@
# libsensors configuration file for as7816-64x # libsensors configuration file for as7816-64x
# ------------------------------------------------ # ------------------------------------------------
# #
bus "i2c-9" "i2c-1-mux (chan_id 0)" bus "i2c-9" "i2c-1-mux (chan_id 0)"
bus "i2c-10" "i2c-1-mux (chan_id 1)" bus "i2c-10" "i2c-1-mux (chan_id 1)"
bus "i2c-17" "i2c-1-mux (chan_id 0)" bus "i2c-17" "i2c-1-mux (chan_id 0)"
bus "i2c-18" "i2c-1-mux (chan_id 1)" bus "i2c-18" "i2c-1-mux (chan_id 1)"
chip "psu_pmbus-i2c-*-5b"
chip "ym2851-i2c-*-5b"
label in3 "PSU 1 Voltage" label in3 "PSU 1 Voltage"
label fan1 "PSU 1 Fan" label fan1 "PSU 1 Fan"
label temp1 "PSU 1 Temperature" label temp1 "PSU 1 Temperature"
label power2 "PSU 1 Power" label power2 "PSU 1 Power"
label curr2 "PSU 1 Current" label curr2 "PSU 1 Current"
chip "psu_pmbus-i2c-*-58"
chip "ym2851-i2c-*-58"
label in3 "PSU 2 Voltage" label in3 "PSU 2 Voltage"
label fan1 "PSU 2 Fan" label fan1 "PSU 2 Fan"
label temp1 "PSU 2 Temperature" label temp1 "PSU 2 Temperature"
label power2 "PSU 2 Power" label power2 "PSU 2 Power"
label curr2 "PSU 2 Current" label curr2 "PSU 2 Current"
chip "fan_ctrl-*"
chip "as7816_64x_fan-*" label fan1 "Fantray1 Front"
label fan1 "Fan 1 Front" label fan2 "Fantray1 Rear"
label fan2 "Fan 2 Front" label fan3 "Fantray2 Front"
label fan3 "Fan 3 Front" label fan4 "Fantray2 Rear"
label fan4 "Fan 4 Front" label fan5 "Fantray3 Front"
label fan11 "Fan 1 Rear" label fan6 "Fantray3 Rear"
label fan12 "Fan 2 Rear" label fan7 "Fantray4 Front"
label fan13 "Fan 3 Rear" label fan8 "Fantray4 Rear"
label fan14 "Fan 4 Rear"
chip "lm75-i2c-*-48" chip "lm75-i2c-*-48"
label temp1 "Main Board Temperature" label temp1 "MB_MAC_temp"
chip "lm75-i2c-*-49" chip "lm75-i2c-*-49"
label temp1 "Main Board Temperature" label temp1 "MB_RearCenter_temp"
chip "lm75-i2c-*-4a" chip "lm75-i2c-*-4a"
label temp1 "Main Board Temperature" label temp1 "MB_RightCenter_temp"
chip "lm75-i2c-*-4b" chip "lm75-i2c-*-4b"
label temp1 "CPU Board Temperature" label temp1 "CpuBoard_temp"
chip "lm75-i2c-*-4d" chip "lm75-i2c-*-4d"
label temp1 "Fan Board Temperature" label temp1 "FB_1_temp"
chip "lm75-i2c-*-4e" chip "lm75-i2c-*-4e"
label temp1 "Fan Board Temperature" label temp1 "FB_2_temp"