diff options
author | George Hung <george.hung@quantatw.com> | 2020-07-16 08:47:14 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-07-18 21:32:53 +0300 |
commit | 0a72c0fb30a11e973c4f1b2591156aae896eeb1b (patch) | |
tree | cbdcd3bf28a8c326706377d48c84b0b3aa7f8de5 /meta-quanta/meta-gbs/recipes-phosphor/fans | |
parent | d09ea35a4b76fc7ba0cc7fef1d641e23f011bd8f (diff) | |
download | openbmc-0a72c0fb30a11e973c4f1b2591156aae896eeb1b.tar.xz |
meta-quanta: gbs: rename fan2/3/4 to fb_fan0/1/2
Change the sensor name of fans:
fan2 -> fb_fan0
fan3 -> fb_fan1
fan4 -> fb_fan2
(From meta-quanta rev: 43bbb292c0d151841db415802849df965f6151ce)
Signed-off-by: George Hung <george.hung@quantatw.com>
Change-Id: If81cf92c50da512986344b31ba20d93af6dcf061
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-quanta/meta-gbs/recipes-phosphor/fans')
-rw-r--r-- | meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config.json | 24 | ||||
-rw-r--r-- | meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/fan-table-init.sh | 6 |
2 files changed, 15 insertions, 15 deletions
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 |