From 3281839c6ab68aa822bf4f0c7e56fb304fa74790 Mon Sep 17 00:00:00 2001 From: Hank Liou Date: Tue, 9 Jul 2019 09:35:18 +0800 Subject: 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 Change-Id: Ifbc868d751b0a6194c2768bcfdaa8a9e231819c3 Signed-off-by: Brad Bishop --- .../fans/phosphor-pid-control/config-2ssd.json | 12 ++++++------ .../fans/phosphor-pid-control/config-8ssd.json | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'meta-quanta/meta-gsj') 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 a4552bc5b2..c294a733ad 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 7cfa861cbe..430c3f4d27 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 -- cgit v1.2.3