From 1be056a5825c0e9883b93e78cac0b56902e71a54 Mon Sep 17 00:00:00 2001
From: Steven Janssen <janssens@us.ibm.com>
Date: Wed, 7 Aug 2019 07:26:34 -0500
Subject: [PATCH] Update pmic header files

Change-Id: Ie6428fd5dd34a4afa06d548bff54eab759d90f0c
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/81887
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Mark Pizzutillo <mark.pizzutillo@ibm.com>
Dev-Ready: Steven B Janssen <janssens@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: Jennifer A Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/81907
Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>
Tested-by: Daniel M Crowell <dcrowell@us.ibm.com>
---
 .../hwp/pmic/lib/utils/pmic_enable_utils.H      | 10 ----------
 .../common/procedures/hwp/pmic/pmic_enable.H    | 17 ++++++++++++++++-
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/import/chips/ocmb/common/procedures/hwp/pmic/lib/utils/pmic_enable_utils.H b/src/import/chips/ocmb/common/procedures/hwp/pmic/lib/utils/pmic_enable_utils.H
index 527cc24e928..5e6d4321652 100644
--- a/src/import/chips/ocmb/common/procedures/hwp/pmic/lib/utils/pmic_enable_utils.H
+++ b/src/import/chips/ocmb/common/procedures/hwp/pmic/lib/utils/pmic_enable_utils.H
@@ -51,16 +51,6 @@ namespace mss
 {
 namespace pmic
 {
-
-///
-/// @brief Different enable operations
-///
-enum enable_mode
-{
-    SPD = 0, // Use values from the SPD (default). Overwrite the vendor region with SPD settings
-    MANUAL = 1, // Use voltage settings currently in the vendor region. (Changed via pmic_update, or factory defaults)
-};
-
 /// @brief pointer to PMIC attribute getters for DIMM target
 typedef fapi2::ReturnCode (*pmic_attr_ptr)(const fapi2::Target<fapi2::TARGET_TYPE_DIMM>& i_target, uint8_t& o_value);
 typedef fapi2::ReturnCode (*pmic_attr_ptr_signed)(const fapi2::Target<fapi2::TARGET_TYPE_DIMM>& i_target,
diff --git a/src/import/chips/ocmb/common/procedures/hwp/pmic/pmic_enable.H b/src/import/chips/ocmb/common/procedures/hwp/pmic/pmic_enable.H
index 62a0fe12f90..e709c7f4045 100644
--- a/src/import/chips/ocmb/common/procedures/hwp/pmic/pmic_enable.H
+++ b/src/import/chips/ocmb/common/procedures/hwp/pmic/pmic_enable.H
@@ -37,7 +37,22 @@
 #define __PMIC_ENABLE_H__
 
 #include <fapi2.H>
-#include <lib/utils/pmic_enable_utils.H>
+
+namespace mss
+{
+namespace pmic
+{
+
+///
+/// @brief Different enable operations
+///
+enum enable_mode
+{
+    SPD = 0, // Use values from the SPD (default). Overwrite the vendor region with SPD settings
+    MANUAL = 1, // Use voltage settings currently in the vendor region. (Changed via pmic_update, or factory defaults)
+};
+}
+}
 
 typedef fapi2::ReturnCode (*pmic_enable_FP_t) (const fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP>&,
         const mss::pmic::enable_mode);