summaryrefslogtreecommitdiff
path: root/meta-quanta/meta-gsj
diff options
context:
space:
mode:
authorHank Liou <Hank.Liou@quantatw.com>2019-07-09 04:35:18 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-08-07 15:10:17 +0300
commit3281839c6ab68aa822bf4f0c7e56fb304fa74790 (patch)
tree8f3bfe346cd9a1132296c33534a8b11b20f1f6a3 /meta-quanta/meta-gsj
parent20fd15d48ab8c6bf297a49cae11da4e41615d01c (diff)
downloadopenbmc-3281839c6ab68aa822bf4f0c7e56fb304fa74790.tar.xz
meta-gsj: phosphor-pid-control: Change fan read path
This commit changes fan read path so as not to trigger fan-fail utility in phosphor-pid-control but dual-rotor-fail service. (From meta-quanta rev: ccd4657416374d12b1b8bd1bf545cf9ba8527419) Signed-off-by: Hank Liou <Hank.Liou@quantatw.com> Change-Id: Ifbc868d751b0a6194c2768bcfdaa8a9e231819c3 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-quanta/meta-gsj')
-rw-r--r--meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control/config-2ssd.json12
-rw-r--r--meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control/config-8ssd.json12
2 files changed, 12 insertions, 12 deletions
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control/config-2ssd.json b/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control/config-2ssd.json
index a4552bc5b..c294a733a 100644
--- a/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control/config-2ssd.json
+++ b/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control/config-2ssd.json
@@ -3,7 +3,7 @@
{
"name": "Fan0_0_RPM",
"type": "fan",
- "readPath": "/xyz/openbmc_project/sensors/fan_tach/Fan0_0_RPM",
+ "readPath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/fan1_input",
"writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/pwm1",
"min": 0,
"max": 255
@@ -11,7 +11,7 @@
{
"name": "Fan0_1_RPM",
"type": "fan",
- "readPath": "/xyz/openbmc_project/sensors/fan_tach/Fan0_1_RPM",
+ "readPath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/fan2_input",
"writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/pwm1",
"min": 0,
"max": 255
@@ -19,7 +19,7 @@
{
"name": "Fan1_0_RPM",
"type": "fan",
- "readPath": "/xyz/openbmc_project/sensors/fan_tach/Fan1_0_RPM",
+ "readPath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/fan3_input",
"writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/pwm2",
"min": 0,
"max": 255
@@ -27,7 +27,7 @@
{
"name": "Fan1_1_RPM",
"type": "fan",
- "readPath": "/xyz/openbmc_project/sensors/fan_tach/Fan1_1_RPM",
+ "readPath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/fan4_input",
"writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/pwm2",
"min": 0,
"max": 255
@@ -35,7 +35,7 @@
{
"name": "Fan2_0_RPM",
"type": "fan",
- "readPath": "/xyz/openbmc_project/sensors/fan_tach/Fan2_0_RPM",
+ "readPath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/fan5_input",
"writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/pwm3",
"min": 0,
"max": 255
@@ -43,7 +43,7 @@
{
"name": "Fan2_1_RPM",
"type": "fan",
- "readPath": "/xyz/openbmc_project/sensors/fan_tach/Fan2_1_RPM",
+ "readPath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/fan6_input",
"writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/pwm3",
"min": 0,
"max": 255
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control/config-8ssd.json b/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control/config-8ssd.json
index 7cfa861cb..430c3f4d2 100644
--- a/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control/config-8ssd.json
+++ b/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control/config-8ssd.json
@@ -3,7 +3,7 @@
{
"name": "Fan0_0_RPM",
"type": "fan",
- "readPath": "/xyz/openbmc_project/sensors/fan_tach/Fan0_0_RPM",
+ "readPath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/fan1_input",
"writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/pwm1",
"min": 0,
"max": 255
@@ -11,7 +11,7 @@
{
"name": "Fan0_1_RPM",
"type": "fan",
- "readPath": "/xyz/openbmc_project/sensors/fan_tach/Fan0_1_RPM",
+ "readPath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/fan2_input",
"writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/pwm1",
"min": 0,
"max": 255
@@ -19,7 +19,7 @@
{
"name": "Fan1_0_RPM",
"type": "fan",
- "readPath": "/xyz/openbmc_project/sensors/fan_tach/Fan1_0_RPM",
+ "readPath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/fan3_input",
"writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/pwm2",
"min": 0,
"max": 255
@@ -27,7 +27,7 @@
{
"name": "Fan1_1_RPM",
"type": "fan",
- "readPath": "/xyz/openbmc_project/sensors/fan_tach/Fan1_1_RPM",
+ "readPath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/fan4_input",
"writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/pwm2",
"min": 0,
"max": 255
@@ -35,7 +35,7 @@
{
"name": "Fan2_0_RPM",
"type": "fan",
- "readPath": "/xyz/openbmc_project/sensors/fan_tach/Fan2_0_RPM",
+ "readPath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/fan5_input",
"writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/pwm3",
"min": 0,
"max": 255
@@ -43,7 +43,7 @@
{
"name": "Fan2_1_RPM",
"type": "fan",
- "readPath": "/xyz/openbmc_project/sensors/fan_tach/Fan2_1_RPM",
+ "readPath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/fan6_input",
"writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/pwm3",
"min": 0,
"max": 255