commit ccd4657416374d12b1b8bd1bf545cf9ba8527419
author Hank Liou <Hank.Liou@quantatw.com> Tue Jul 09 09:35:18 2019 +0800
committer Brad Bishop <radsquirrel@gmail.com> Wed Aug 07 12:04:40 2019 +0000
tree 669ae6ab762b2579eba412049f404a552bc6e764
parent c95abb8caea6e56de78f009338ed656518928566

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.

Signed-off-by: Hank Liou <Hank.Liou@quantatw.com>
Change-Id: I5810f1471f572557d3ee1f3bbd7e71ca6b451654

meta-gsj/recipes-phosphor/fans/phosphor-pid-control/config-2ssd.json

diff --git a/meta-gsj/recipes-phosphor/fans/phosphor-pid-control/config-2ssd.json b/meta-gsj/recipes-phosphor/fans/phosphor-pid-control/config-2ssd.json
index a4552bc..c294a73 100644
--- a/meta-gsj/recipes-phosphor/fans/phosphor-pid-control/config-2ssd.json
+++ b/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