From d1a90aa35d35426789d8f4061166a6dd8d27a30e Mon Sep 17 00:00:00 2001 From: George Liu Date: Fri, 2 Oct 2020 16:39:04 +0800 Subject: fp5280g2: Fix the occ-hwmon.*.conf config path Add the fsi-master file path to get the correct OCC information. Tested: built successfully on fp5280g2 and get the corrent OCC information by the D-Bus command. (From meta-inspur rev: bf4c44199ffa9cb3804df09932440002f9d0d2c7) Signed-off-by: George Liu Change-Id: I35ef99d98b3078b625e809e911265a56c4849cc9 Signed-off-by: Andrew Geissler --- .../00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf | 69 ++++++++++++++++++++++ .../01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf | 64 ++++++++++++++++++++ .../00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf | 69 ---------------------- .../01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf | 64 -------------------- .../sensors/phosphor-hwmon_%.bbappend | 2 +- 5 files changed, 134 insertions(+), 134 deletions(-) create mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf create mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf delete mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf delete mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf (limited to 'meta-inspur') diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf new file mode 100644 index 000000000..b629dfc4c --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf @@ -0,0 +1,69 @@ +MODE_temp1 = "label" +MODE_temp2 = "label" +MODE_temp3 = "label" +MODE_temp4 = "label" +MODE_temp5 = "label" +MODE_temp6 = "label" +MODE_temp7 = "label" +MODE_temp8 = "label" +MODE_temp9 = "label" +MODE_temp10 = "label" +MODE_temp11 = "label" +MODE_temp12 = "label" +MODE_temp13 = "label" +MODE_temp14 = "label" +MODE_temp15 = "label" +MODE_temp16 = "label" +MODE_temp17 = "label" +MODE_temp18 = "label" +MODE_temp19 = "label" +MODE_temp20 = "label" +MODE_temp21 = "label" +MODE_temp22 = "label" +MODE_temp23 = "label" +MODE_temp24 = "label" +MODE_temp25 = "label" +MODE_temp26 = "label" +MODE_temp27 = "label" +MODE_temp28 = "label" +MODE_temp29 = "label" +MODE_temp30 = "label" +MODE_temp31 = "label" +MODE_temp32 = "label" +LABEL_temp91 = "p0_core0_temp" +LABEL_temp92 = "p0_core1_temp" +LABEL_temp93 = "p0_core2_temp" +LABEL_temp94 = "p0_core3_temp" +LABEL_temp95 = "p0_core4_temp" +LABEL_temp96 = "p0_core5_temp" +LABEL_temp97 = "p0_core6_temp" +LABEL_temp98 = "p0_core7_temp" +LABEL_temp99 = "p0_core8_temp" +LABEL_temp100 = "p0_core9_temp" +LABEL_temp101 = "p0_core10_temp" +LABEL_temp102 = "p0_core11_temp" +LABEL_temp103 = "p0_core12_temp" +LABEL_temp104 = "p0_core13_temp" +LABEL_temp105 = "p0_core14_temp" +LABEL_temp106 = "p0_core15_temp" +LABEL_temp107 = "p0_core16_temp" +LABEL_temp108 = "p0_core17_temp" +LABEL_temp109 = "p0_core18_temp" +LABEL_temp110 = "p0_core19_temp" +LABEL_temp111 = "p0_core20_temp" +LABEL_temp112 = "p0_core21_temp" +LABEL_temp113 = "p0_core22_temp" +LABEL_temp114 = "p0_core23_temp" +LABEL_temp27 = "dimm0_temp" +LABEL_temp28 = "dimm1_temp" +LABEL_temp29 = "dimm2_temp" +LABEL_temp30 = "dimm3_temp" +LABEL_temp31 = "dimm4_temp" +LABEL_temp32 = "dimm5_temp" +LABEL_temp33 = "dimm6_temp" +LABEL_temp34 = "dimm7_temp" +LABEL_power1 = "others" +LABEL_power2 = "hdd" +LABEL_power3 = "gpu_01" +LABEL_power4 = "gpu_23" +LABEL_power5 = "standby" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf new file mode 100644 index 000000000..625c96bc5 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf @@ -0,0 +1,64 @@ +MODE_temp1 = "label" +MODE_temp2 = "label" +MODE_temp3 = "label" +MODE_temp4 = "label" +MODE_temp5 = "label" +MODE_temp6 = "label" +MODE_temp7 = "label" +MODE_temp8 = "label" +MODE_temp9 = "label" +MODE_temp10 = "label" +MODE_temp11 = "label" +MODE_temp12 = "label" +MODE_temp13 = "label" +MODE_temp14 = "label" +MODE_temp15 = "label" +MODE_temp16 = "label" +MODE_temp17 = "label" +MODE_temp18 = "label" +MODE_temp19 = "label" +MODE_temp20 = "label" +MODE_temp21 = "label" +MODE_temp22 = "label" +MODE_temp23 = "label" +MODE_temp24 = "label" +MODE_temp25 = "label" +MODE_temp26 = "label" +MODE_temp27 = "label" +MODE_temp28 = "label" +MODE_temp29 = "label" +MODE_temp30 = "label" +MODE_temp31 = "label" +MODE_temp32 = "label" +LABEL_temp115 = "p1_core0_temp" +LABEL_temp116 = "p1_core1_temp" +LABEL_temp117 = "p1_core2_temp" +LABEL_temp118 = "p1_core3_temp" +LABEL_temp119 = "p1_core4_temp" +LABEL_temp120 = "p1_core5_temp" +LABEL_temp121 = "p1_core6_temp" +LABEL_temp122 = "p1_core7_temp" +LABEL_temp123 = "p1_core8_temp" +LABEL_temp124 = "p1_core9_temp" +LABEL_temp125 = "p1_core10_temp" +LABEL_temp126 = "p1_core11_temp" +LABEL_temp127 = "p1_core12_temp" +LABEL_temp128 = "p1_core13_temp" +LABEL_temp129 = "p1_core14_temp" +LABEL_temp130 = "p1_core15_temp" +LABEL_temp131 = "p1_core16_temp" +LABEL_temp132 = "p1_core17_temp" +LABEL_temp133 = "p1_core18_temp" +LABEL_temp134 = "p1_core19_temp" +LABEL_temp135 = "p1_core20_temp" +LABEL_temp136 = "p1_core21_temp" +LABEL_temp137 = "p1_core22_temp" +LABEL_temp138 = "p1_core23_temp" +LABEL_temp35 = "dimm8_temp" +LABEL_temp36 = "dimm9_temp" +LABEL_temp37 = "dimm10_temp" +LABEL_temp38 = "dimm11_temp" +LABEL_temp39 = "dimm12_temp" +LABEL_temp40 = "dimm13_temp" +LABEL_temp41 = "dimm14_temp" +LABEL_temp42 = "dimm15_temp" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf deleted file mode 100644 index b629dfc4c..000000000 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf +++ /dev/null @@ -1,69 +0,0 @@ -MODE_temp1 = "label" -MODE_temp2 = "label" -MODE_temp3 = "label" -MODE_temp4 = "label" -MODE_temp5 = "label" -MODE_temp6 = "label" -MODE_temp7 = "label" -MODE_temp8 = "label" -MODE_temp9 = "label" -MODE_temp10 = "label" -MODE_temp11 = "label" -MODE_temp12 = "label" -MODE_temp13 = "label" -MODE_temp14 = "label" -MODE_temp15 = "label" -MODE_temp16 = "label" -MODE_temp17 = "label" -MODE_temp18 = "label" -MODE_temp19 = "label" -MODE_temp20 = "label" -MODE_temp21 = "label" -MODE_temp22 = "label" -MODE_temp23 = "label" -MODE_temp24 = "label" -MODE_temp25 = "label" -MODE_temp26 = "label" -MODE_temp27 = "label" -MODE_temp28 = "label" -MODE_temp29 = "label" -MODE_temp30 = "label" -MODE_temp31 = "label" -MODE_temp32 = "label" -LABEL_temp91 = "p0_core0_temp" -LABEL_temp92 = "p0_core1_temp" -LABEL_temp93 = "p0_core2_temp" -LABEL_temp94 = "p0_core3_temp" -LABEL_temp95 = "p0_core4_temp" -LABEL_temp96 = "p0_core5_temp" -LABEL_temp97 = "p0_core6_temp" -LABEL_temp98 = "p0_core7_temp" -LABEL_temp99 = "p0_core8_temp" -LABEL_temp100 = "p0_core9_temp" -LABEL_temp101 = "p0_core10_temp" -LABEL_temp102 = "p0_core11_temp" -LABEL_temp103 = "p0_core12_temp" -LABEL_temp104 = "p0_core13_temp" -LABEL_temp105 = "p0_core14_temp" -LABEL_temp106 = "p0_core15_temp" -LABEL_temp107 = "p0_core16_temp" -LABEL_temp108 = "p0_core17_temp" -LABEL_temp109 = "p0_core18_temp" -LABEL_temp110 = "p0_core19_temp" -LABEL_temp111 = "p0_core20_temp" -LABEL_temp112 = "p0_core21_temp" -LABEL_temp113 = "p0_core22_temp" -LABEL_temp114 = "p0_core23_temp" -LABEL_temp27 = "dimm0_temp" -LABEL_temp28 = "dimm1_temp" -LABEL_temp29 = "dimm2_temp" -LABEL_temp30 = "dimm3_temp" -LABEL_temp31 = "dimm4_temp" -LABEL_temp32 = "dimm5_temp" -LABEL_temp33 = "dimm6_temp" -LABEL_temp34 = "dimm7_temp" -LABEL_power1 = "others" -LABEL_power2 = "hdd" -LABEL_power3 = "gpu_01" -LABEL_power4 = "gpu_23" -LABEL_power5 = "standby" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf deleted file mode 100644 index 625c96bc5..000000000 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf +++ /dev/null @@ -1,64 +0,0 @@ -MODE_temp1 = "label" -MODE_temp2 = "label" -MODE_temp3 = "label" -MODE_temp4 = "label" -MODE_temp5 = "label" -MODE_temp6 = "label" -MODE_temp7 = "label" -MODE_temp8 = "label" -MODE_temp9 = "label" -MODE_temp10 = "label" -MODE_temp11 = "label" -MODE_temp12 = "label" -MODE_temp13 = "label" -MODE_temp14 = "label" -MODE_temp15 = "label" -MODE_temp16 = "label" -MODE_temp17 = "label" -MODE_temp18 = "label" -MODE_temp19 = "label" -MODE_temp20 = "label" -MODE_temp21 = "label" -MODE_temp22 = "label" -MODE_temp23 = "label" -MODE_temp24 = "label" -MODE_temp25 = "label" -MODE_temp26 = "label" -MODE_temp27 = "label" -MODE_temp28 = "label" -MODE_temp29 = "label" -MODE_temp30 = "label" -MODE_temp31 = "label" -MODE_temp32 = "label" -LABEL_temp115 = "p1_core0_temp" -LABEL_temp116 = "p1_core1_temp" -LABEL_temp117 = "p1_core2_temp" -LABEL_temp118 = "p1_core3_temp" -LABEL_temp119 = "p1_core4_temp" -LABEL_temp120 = "p1_core5_temp" -LABEL_temp121 = "p1_core6_temp" -LABEL_temp122 = "p1_core7_temp" -LABEL_temp123 = "p1_core8_temp" -LABEL_temp124 = "p1_core9_temp" -LABEL_temp125 = "p1_core10_temp" -LABEL_temp126 = "p1_core11_temp" -LABEL_temp127 = "p1_core12_temp" -LABEL_temp128 = "p1_core13_temp" -LABEL_temp129 = "p1_core14_temp" -LABEL_temp130 = "p1_core15_temp" -LABEL_temp131 = "p1_core16_temp" -LABEL_temp132 = "p1_core17_temp" -LABEL_temp133 = "p1_core18_temp" -LABEL_temp134 = "p1_core19_temp" -LABEL_temp135 = "p1_core20_temp" -LABEL_temp136 = "p1_core21_temp" -LABEL_temp137 = "p1_core22_temp" -LABEL_temp138 = "p1_core23_temp" -LABEL_temp35 = "dimm8_temp" -LABEL_temp36 = "dimm9_temp" -LABEL_temp37 = "dimm10_temp" -LABEL_temp38 = "dimm11_temp" -LABEL_temp39 = "dimm12_temp" -LABEL_temp40 = "dimm13_temp" -LABEL_temp41 = "dimm14_temp" -LABEL_temp42 = "dimm15_temp" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 2dd9ee5c2..3b4166390 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -22,7 +22,7 @@ OCCS = " \ 00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \ " -OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" +OCCSFMT = "devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/{0}.conf" OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}" -- cgit v1.2.3