diff options
Diffstat (limited to 'meta-quanta')
6 files changed, 31 insertions, 31 deletions
diff --git a/meta-quanta/meta-gbs/recipes-gbs/gbs-detect-fan-fail/files/gbs-detect-fan-fail.sh b/meta-quanta/meta-gbs/recipes-gbs/gbs-detect-fan-fail/files/gbs-detect-fan-fail.sh index 520b1c991..56ae7bbc5 100644 --- a/meta-quanta/meta-gbs/recipes-gbs/gbs-detect-fan-fail/files/gbs-detect-fan-fail.sh +++ b/meta-quanta/meta-gbs/recipes-gbs/gbs-detect-fan-fail/files/gbs-detect-fan-fail.sh @@ -33,9 +33,9 @@ function is_fan_fail() { fan_tach_path=( '/xyz/openbmc_project/sensors/fan_tach/fan0' '/xyz/openbmc_project/sensors/fan_tach/fan1' - '/xyz/openbmc_project/sensors/fan_tach/fan2' - '/xyz/openbmc_project/sensors/fan_tach/fan3' - '/xyz/openbmc_project/sensors/fan_tach/fan4' + '/xyz/openbmc_project/sensors/fan_tach/fb_fan0' + '/xyz/openbmc_project/sensors/fan_tach/fb_fan1' + '/xyz/openbmc_project/sensors/fan_tach/fb_fan2' ) check_fail_flag=0 diff --git a/meta-quanta/meta-gbs/recipes-gbs/gbs-ipmi-entity-association-map/files/entity_association_map.json b/meta-quanta/meta-gbs/recipes-gbs/gbs-ipmi-entity-association-map/files/entity_association_map.json index a0992b73c..f4e453a9a 100644 --- a/meta-quanta/meta-gbs/recipes-gbs/gbs-ipmi-entity-association-map/files/entity_association_map.json +++ b/meta-quanta/meta-gbs/recipes-gbs/gbs-ipmi-entity-association-map/files/entity_association_map.json @@ -18,9 +18,9 @@ "fan": [ {"instance": 0, "name": "/fan0"}, {"instance": 1, "name": "/fan1"}, - {"instance": 2, "name": "/fan2"}, - {"instance": 3, "name": "/fan3"}, - {"instance": 4, "name": "/fan4"} + {"instance": 2, "name": "/fb_fan0"}, + {"instance": 3, "name": "/fb_fan1"}, + {"instance": 4, "name": "/fb_fan2"} ], "cooling_unit": [ {"instance": 0, "name": "/ZONE0"}, diff --git a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml index 83d379225..26a785fbe 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml +++ b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml @@ -514,7 +514,7 @@ type: int64_t # fan/pwm mapping -# fan0/1 on Mobo, fan2/3/4 on fan board +# fan0/1 on Mobo, fb_fan0/1/2 on fan board # PWM0 => fan tach 0 # PWM1 => fan tach 1 # PWM2 => fan tach 2 @@ -551,17 +551,17 @@ 0x62: <<: *fan_rpm_read entityInstance: 0x02 - path: /xyz/openbmc_project/sensors/fan_tach/fan2 + path: /xyz/openbmc_project/sensors/fan_tach/fb_fan0 0x63: <<: *fan_rpm_read entityInstance: 0x03 - path: /xyz/openbmc_project/sensors/fan_tach/fan3 + path: /xyz/openbmc_project/sensors/fan_tach/fb_fan1 0x64: <<: *fan_rpm_read entityInstance: 0x04 - path: /xyz/openbmc_project/sensors/fan_tach/fan4 + path: /xyz/openbmc_project/sensors/fan_tach/fb_fan2 0x65: &fan_pwm entityID: 0x1D @@ -590,17 +590,17 @@ 0x67: <<: *fan_pwm entityInstance: 0x07 - path: /xyz/openbmc_project/sensors/fan_tach/fan2 + path: /xyz/openbmc_project/sensors/fan_tach/fb_fan0 0x68: <<: *fan_pwm entityInstance: 0x08 - path: /xyz/openbmc_project/sensors/fan_tach/fan3 + path: /xyz/openbmc_project/sensors/fan_tach/fb_fan1 0x69: <<: *fan_pwm entityInstance: 0x09 - path: /xyz/openbmc_project/sensors/fan_tach/fan4 + path: /xyz/openbmc_project/sensors/fan_tach/fb_fan2 # NVME SSD locate/fault LEDs 0x71: &locateled diff --git a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config.json b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config.json index e28ac9c8f..d014380b1 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config.json +++ b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config.json @@ -18,25 +18,25 @@ "max": 255 }, { - "name": "fan2", + "name": "fb_fan0", "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/fan2", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/fb_fan0", "writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/Fan_0_To_4_Hwmon/pwm3", "min": 0, "max": 255 }, { - "name": "fan3", + "name": "fb_fan1", "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/fan3", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/fb_fan1", "writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/Fan_0_To_4_Hwmon/pwm4", "min": 0, "max": 255 }, { - "name": "fan4", + "name": "fb_fan2", "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/fan4", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/fb_fan2", "writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/Fan_0_To_4_Hwmon/pwm5", "min": 0, "max": 255 @@ -155,9 +155,9 @@ "failsafePercent": 100.0, "pids": [ { - "name": "fan2", + "name": "fb_fan0", "type": "fan", - "inputs": ["fan2"], + "inputs": ["fb_fan0"], "setpoint": 0.0, "pid": { "samplePeriod": 0.1, @@ -174,9 +174,9 @@ } }, { - "name": "fan3", + "name": "fb_fan1", "type": "fan", - "inputs": ["fan3"], + "inputs": ["fb_fan1"], "setpoint": 0.0, "pid": { "samplePeriod": 0.1, @@ -193,9 +193,9 @@ } }, { - "name": "fan4", + "name": "fb_fan2", "type": "fan", - "inputs": ["fan4"], + "inputs": ["fb_fan2"], "setpoint": 0.0, "pid": { "samplePeriod": 0.1, diff --git a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/fan-table-init.sh b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/fan-table-init.sh index 06914afd0..5706a73fb 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/fan-table-init.sh +++ b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/fan-table-init.sh @@ -3,9 +3,9 @@ # wait for fan dbus mapper wait /xyz/openbmc_project/sensors/fan_tach/fan0 mapper wait /xyz/openbmc_project/sensors/fan_tach/fan1 -mapper wait /xyz/openbmc_project/sensors/fan_tach/fan2 -mapper wait /xyz/openbmc_project/sensors/fan_tach/fan3 -mapper wait /xyz/openbmc_project/sensors/fan_tach/fan4 +mapper wait /xyz/openbmc_project/sensors/fan_tach/fb_fan0 +mapper wait /xyz/openbmc_project/sensors/fan_tach/fb_fan1 +mapper wait /xyz/openbmc_project/sensors/fan_tach/fb_fan2 /usr/bin/fan-default-speed.sh diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf index c7312e605..1a8fafb08 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf @@ -16,7 +16,7 @@ MINVALUE_fan2 = "0" MAXVALUE_fan2 = "20775" PWM_TARGET_fan2 = 2 -LABEL_fan3= "fan2" +LABEL_fan3= "fb_fan0" WARNHI_fan3= "19800" WARNLO_fan3= "600" CRITHI_fan3= "19800" @@ -25,7 +25,7 @@ MINVALUE_fan3 = "0" MAXVALUE_fan3 = "20775" PWM_TARGET_fan3 = 3 -LABEL_fan4= "fan3" +LABEL_fan4= "fb_fan1" WARNHI_fan4= "19800" WARNLO_fan4= "600" CRITHI_fan4= "19800" @@ -34,7 +34,7 @@ MINVALUE_fan4 = "0" MAXVALUE_fan4 = "20775" PWM_TARGET_fan4 = 4 -LABEL_fan5= "fan4" +LABEL_fan5= "fb_fan2" WARNHI_fan5= "19800" WARNLO_fan5= "600" CRITHI_fan5= "19800" |