Revert "IBS:Fix(rm) PSU output thresholds when pwr is OFF"

This reverts commit 3ad9ae893ad9829057a94f5c6d89233af38d19d5.

2 files changed, 3 insertions, 54 deletions

diff --git a/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0005-Add-PowerState-to-PSU-output-sensors.patch b/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0005-Add-PowerState-to-PSU-output-sensors.patch
deleted file mode 100644
index 2c9b2e777b..0000000000
--- a/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0005-Add-PowerState-to-PSU-output-sensors.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From be7e8ba3ab6c46a0d069545c905ab63a5ac1b223 Mon Sep 17 00:00:00 2001
-From: "Evgeny Alekseev (IBS Group)" <ealekseev@ibs.sila.ru>
-Date: Fri, 30 Sep 2022 08:22:15 +0300
-Subject: [PATCH] Add PowerState to PSU output sensors
-
----
- configurations/aspower_u1a-d11200_psu.json | 16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/configurations/aspower_u1a-d11200_psu.json b/configurations/aspower_u1a-d11200_psu.json
-index 7b9ad79..efa8ef5 100644
---- a/configurations/aspower_u1a-d11200_psu.json
-+++ b/configurations/aspower_u1a-d11200_psu.json
-@@ -142,7 +142,7 @@
-                         "Severity": 0,
-                         "Value": 0
-                     },
--{
-+                    {
-                         "Direction": "greater than",
-                         "Label": "pin",
-                         "Name": "upper critical",
-@@ -274,7 +274,8 @@
-             {
-                 "Name" : "PSU$ADDRESS % 4 + 1 Output Current",
-                 "EntityId": "0x01",
--                "EntityInstance": "$ADDRESS % 4 + 4"
-+                "EntityInstance": "$ADDRESS % 4 + 4",
-+                "PowerState" : "On"
- 
-             },
-             {
-@@ -282,7 +283,18 @@
-                 "EntityId": "0x01",
-                 "EntityInstance": "$ADDRESS % 4 + 6"
- 
-+            },
-+            {
-+                "Name" : "PSU$ADDRESS % 4 + 1 Output Voltage",
-+                "PowerState" : "On"
-+
-+            },
-+            {
-+                "Name" : "PSU$ADDRESS % 4 + 1 Output Power",
-+                "PowerState" : "On"
-+
-             }
-+
-         ],
-         "Name": "ASPOWER 1200W PSU $ADDRESS % 4 + 1",
-         "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'U1A-D11200-DRB'})",
diff --git a/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend
index 53424eec94..385b058157 100644
--- a/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend
+++ b/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend
@@ -3,6 +3,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 SRC_URI += "file://0001-Add-ASPOWER1200-Vin-Vout-Pout-thresholds.patch \
             file://0002-Add-PID-Zone-to-AS1200.patch \
             file://0003-Add-Ipmi-Decorator-To-Schemas.patch \
-	    file://0004-AS1200-JSON-Add-Thresholds-and-IPMI.patch \
-            file://0005-Add-PowerState-to-PSU-output-sensors.patch \
-            " 
+	        file://0004-AS1200-JSON-Add-Thresholds-and-IPMI.patch \
+            "
+