From 9c2c90fb92d0ff2604f14b882e26ea9641780370 Mon Sep 17 00:00:00 2001
From: Andrew Geissler <geissonator@yahoo.com>
Date: Mon, 12 Apr 2021 13:26:44 -0500
Subject: 1s4u: replace fan3 with fan4

The 1s4u hardware is configured with fans at 0,1,2, and 4 locations.

Tested:
- Verified that we can now power on a 1s4u machine with this change plus
  a kernel device tree change to move to fan 4.

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Ic1415da9ab900c0e553600df89a1e26893f8b0bd
---
 .../phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json   | 4 ++--
 .../phosphor-fan-presence-config/p10bmc/rainier-1s4u/config.json  | 8 ++++----
 .../fans/phosphor-fan/p10bmc/rainier-1s4u/fans.json               | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'meta-ibm')

diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json
index 1a5e30572..737cb3f3b 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json
@@ -49,7 +49,7 @@
          ]
       },
       {
-         "inventory": "/system/chassis/motherboard/fan3",
+         "inventory": "/system/chassis/motherboard/fan4",
          "functional_delay": 5,
          "allowed_out_of_range_time": 30,
          "deviation": 15,
@@ -59,7 +59,7 @@
          "nonfunc_rotor_error_delay": 0,
          "sensors": [
             {
-               "name": "fan3_0",
+               "name": "fan4_0",
                "has_target": true
             }
          ]
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-1s4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-1s4u/config.json
index cb9eb70de..5bcda88b3 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-1s4u/config.json
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-1s4u/config.json
@@ -63,19 +63,19 @@
       }
    },
    {
-      "name": "fan3",
-      "path": "/system/chassis/motherboard/fan3",
+      "name": "fan4",
+      "path": "/system/chassis/motherboard/fan4",
       "methods": [
          {
             "type": "gpio",
-            "key": 9,
+            "key": 10,
             "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061",
             "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
          },
          {
             "type": "tach",
             "sensors": [
-               "fan3_0"
+               "fan4_0"
             ]
          }
       ],
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/fans.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/fans.json
index 0e4e4d05a..a04270076 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/fans.json
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/fans.json
@@ -18,9 +18,9 @@
         "target_interface": "xyz.openbmc_project.Control.FanSpeed"
     },
     {
-        "name": "fan3",
+        "name": "fan4",
         "zone": "0",
-        "sensors": ["fan3_0"],
+        "sensors": ["fan4_0"],
         "target_interface": "xyz.openbmc_project.Control.FanSpeed"
     }
 ]
-- 
cgit v1.2.3