From 63ed80d2521ee2c5f5b3b0091c3f4d379eebd067 Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Thu, 25 Mar 2021 17:20:24 +0000 Subject: ibm: sensors: Replace rainier with p10bmc The IBM rainier machine name is being replaced with the generic p10bmc. Change-Id: I43d08c3be45d8cc8b03914b9bc257df2668e9fe0 Signed-off-by: Adriana Kobylak --- .../sensors/dbus-sensors_%.bbappend | 2 +- .../apb/bus@1e78a000/i2c-bus@400/max31785@52.conf | 25 +++++++++++++++++ .../i2c-switch@70/i2c@3/max31785@52.conf | 17 ++++++++++++ .../apb/bus@1e78a000/i2c-bus@400/max31785@52.conf | 25 ----------------- .../i2c-switch@70/i2c@3/max31785@52.conf | 17 ------------ .../sensors/phosphor-hwmon_%.bbappend | 4 +-- .../p10bmc/virtual_sensor_config.json | 31 ++++++++++++++++++++++ .../rainier/virtual_sensor_config.json | 31 ---------------------- .../sensors/phosphor-virtual-sensor_%.bbappend | 2 +- 9 files changed, 77 insertions(+), 77 deletions(-) create mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785@52.conf create mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@780/i2c-switch@70/i2c@3/max31785@52.conf delete mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/rainier/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785@52.conf delete mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/rainier/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@780/i2c-switch@70/i2c@3/max31785@52.conf create mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/p10bmc/virtual_sensor_config.json delete mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/rainier/virtual_sensor_config.json diff --git a/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend index 3f2661301..6c283f455 100644 --- a/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend +++ b/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_rainier = "hwmontempsensor" +PACKAGECONFIG_p10bmc = "hwmontempsensor" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785@52.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785@52.conf new file mode 100644 index 000000000..c3b9db146 --- /dev/null +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785@52.conf @@ -0,0 +1,25 @@ +LABEL_fan1 = "fan0_0" + +LABEL_fan2 = "fan1_0" + +LABEL_fan3 = "fan2_0" + +LABEL_fan4 = "fan3_0" + +LABEL_fan5 = "fan4_0" + +LABEL_fan6 = "fan5_0" + +LABEL_fan7 = "fan0_1" + +LABEL_fan8 = "fan1_1" + +LABEL_fan9 = "fan2_1" + +LABEL_fan10 = "fan3_1" + +LABEL_fan11 = "fan4_1" + +LABEL_fan12 = "fan5_1" + +TARGET_MODE = "RPM" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@780/i2c-switch@70/i2c@3/max31785@52.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@780/i2c-switch@70/i2c@3/max31785@52.conf new file mode 100644 index 000000000..d3df21599 --- /dev/null +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@780/i2c-switch@70/i2c@3/max31785@52.conf @@ -0,0 +1,17 @@ +LABEL_fan1 = "fan0_0" + +LABEL_fan2 = "fan1_0" + +LABEL_fan3 = "fan2_0" + +LABEL_fan4 = "fan3_0" + +LABEL_fan5 = "fan0_1" + +LABEL_fan6 = "fan1_1" + +LABEL_fan7 = "fan2_1" + +LABEL_fan8 = "fan3_1" + +TARGET_MODE = "RPM" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/rainier/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785@52.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/rainier/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785@52.conf deleted file mode 100644 index c3b9db146..000000000 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/rainier/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785@52.conf +++ /dev/null @@ -1,25 +0,0 @@ -LABEL_fan1 = "fan0_0" - -LABEL_fan2 = "fan1_0" - -LABEL_fan3 = "fan2_0" - -LABEL_fan4 = "fan3_0" - -LABEL_fan5 = "fan4_0" - -LABEL_fan6 = "fan5_0" - -LABEL_fan7 = "fan0_1" - -LABEL_fan8 = "fan1_1" - -LABEL_fan9 = "fan2_1" - -LABEL_fan10 = "fan3_1" - -LABEL_fan11 = "fan4_1" - -LABEL_fan12 = "fan5_1" - -TARGET_MODE = "RPM" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/rainier/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@780/i2c-switch@70/i2c@3/max31785@52.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/rainier/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@780/i2c-switch@70/i2c@3/max31785@52.conf deleted file mode 100644 index d3df21599..000000000 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/rainier/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@780/i2c-switch@70/i2c@3/max31785@52.conf +++ /dev/null @@ -1,17 +0,0 @@ -LABEL_fan1 = "fan0_0" - -LABEL_fan2 = "fan1_0" - -LABEL_fan3 = "fan2_0" - -LABEL_fan4 = "fan3_0" - -LABEL_fan5 = "fan0_1" - -LABEL_fan6 = "fan1_1" - -LABEL_fan7 = "fan2_1" - -LABEL_fan8 = "fan3_1" - -TARGET_MODE = "RPM" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 8e4d5f621..8841019e5 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -74,7 +74,7 @@ CHIPS_witherspoon-tacoma = " \ bus@1e78a000/i2c-bus@500/tmp275@4a \ " -CHIPS_rainier = " \ +CHIPS_p10bmc = " \ bus@1e78a000/i2c-bus@400/max31785@52 \ bus@1e78a000/i2c-bus@780/i2c-switch@70/i2c@3/max31785@52 \ " @@ -110,7 +110,7 @@ SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ibm-ac-server = " ${@compose_list(d, 'ENVS SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ibm-ac-server = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" SYSTEMD_ENVIRONMENT_FILE_${PN}_append_mihawk = " ${@compose_list(d, 'ENVS', 'ITEMS')}" SYSTEMD_ENVIRONMENT_FILE_${PN}_append_mihawk = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_rainier = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_p10bmc = " ${@compose_list(d, 'ENVS', 'ITEMS')}" # Enable and install the max31785-msl package PACKAGECONFIG_append_ibm-ac-server = " max31785-msl" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/p10bmc/virtual_sensor_config.json b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/p10bmc/virtual_sensor_config.json new file mode 100644 index 000000000..df51c66ab --- /dev/null +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/p10bmc/virtual_sensor_config.json @@ -0,0 +1,31 @@ +[ + { + "Desc": + { + "Name": "Ambient_Virtual_Temp", + "SensorType": "temperature" + }, + "Threshold" : + { + "CriticalHigh": 100, + "CriticalLow": 0, + "WarningHigh": 100, + "WarningLow": 0 + }, + "Params": + { + "DbusParam": + [ + { + "ParamName": "T0", + "Desc": + { + "Name": "Ambient_0_Temp", + "SensorType": "temperature" + } + } + ] + }, + "Expression": "T0" + } +] diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/rainier/virtual_sensor_config.json b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/rainier/virtual_sensor_config.json deleted file mode 100644 index df51c66ab..000000000 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/rainier/virtual_sensor_config.json +++ /dev/null @@ -1,31 +0,0 @@ -[ - { - "Desc": - { - "Name": "Ambient_Virtual_Temp", - "SensorType": "temperature" - }, - "Threshold" : - { - "CriticalHigh": 100, - "CriticalLow": 0, - "WarningHigh": 100, - "WarningLow": 0 - }, - "Params": - { - "DbusParam": - [ - { - "ParamName": "T0", - "Desc": - { - "Name": "Ambient_0_Temp", - "SensorType": "temperature" - } - } - ] - }, - "Expression": "T0" - } -] diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend index 53f8905be..878a58a01 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend @@ -1,6 +1,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://virtual_sensor_config.json" -do_install_append_rainier() { +do_install_append_p10bmc() { install -m 0644 ${WORKDIR}/virtual_sensor_config.json ${D}${datadir}/phosphor-virtual-sensor/ } -- cgit v1.2.3