From 9669b3477ed45d0ba0bcd09ee6a8aa2044dcab27 Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Wed, 10 Jan 2018 18:42:45 -0800
Subject: [PATCH] Revert "[Dell S6100, Z9100] psusutil sysfs attribute changes
 for hwmon (#1264)" (#1297)

This reverts commit 1ceb07a2c5d43e24a1e201884b0eb0833c0b996f.
---
 device/dell/x86_64-dell_s6100_c2538-r0/plugins/psuutil.py | 7 +++----
 device/dell/x86_64-dell_z9100_c2538-r0/plugins/psuutil.py | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/plugins/psuutil.py b/device/dell/x86_64-dell_s6100_c2538-r0/plugins/psuutil.py
index b753cd711dae..83452f69aaa4 100644
--- a/device/dell/x86_64-dell_s6100_c2538-r0/plugins/psuutil.py
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/plugins/psuutil.py
@@ -20,11 +20,10 @@ def __init__(self):
 
     # Get a mailbox register
     def get_pmc_register(self, reg_name):
-        mailbox_dir = "/sys/devices/platform/SMF.512/hwmon/hwmon1"
+        mailbox_dir = "/sys/devices/platform/dell_s6100_lpc"
         retval = 'ERR'
         mb_reg_file = mailbox_dir+'/' + reg_name
         if (not os.path.isfile(mb_reg_file)):
-            print mb_reg_file,  'not found !'
             return retval
 
         try:
@@ -53,7 +52,7 @@ def get_psu_status(self, index):
         faulty
         """
         status = 0
-        psu_status = self.get_pmc_register('psu'+str(index)+'_presence')
+        psu_status = self.get_pmc_register('psu_'+str(index)+'_status')
         if (psu_status != 'ERR'):
             psu_status = int(psu_status, 16)
             # Check for PSU statuse
@@ -70,7 +69,7 @@ def get_psu_presence(self, index):
         :return: Boolean, True if PSU is plugged, False if not
         """
         status = 0
-        psu_presence = self.get_pmc_register('psu'+str(index)+'_presence')
+        psu_presence = self.get_pmc_register('psu_'+str(index)+'_status')
         if (psu_presence != 'ERR'):
             psu_presence = int(psu_presence, 16)
             # Check for PSU presence
diff --git a/device/dell/x86_64-dell_z9100_c2538-r0/plugins/psuutil.py b/device/dell/x86_64-dell_z9100_c2538-r0/plugins/psuutil.py
index 2e07ee818818..2ad6ae7d1491 100644
--- a/device/dell/x86_64-dell_z9100_c2538-r0/plugins/psuutil.py
+++ b/device/dell/x86_64-dell_z9100_c2538-r0/plugins/psuutil.py
@@ -20,11 +20,10 @@ def __init__(self):
 
     # Get a mailbox register
     def get_pmc_register(self, reg_name):
-        mailbox_dir = "/sys/devices/platform/SMF.512/hwmon/hwmon1"
+        mailbox_dir = "/sys/devices/platform/dell_mailbox"
         retval = 'ERR'
         mb_reg_file = mailbox_dir+'/' + reg_name
         if (not os.path.isfile(mb_reg_file)):
-            print mb_reg_file,  'not found !'
             return retval
 
         try:
@@ -53,7 +52,7 @@ def get_psu_status(self, index):
         faulty
         """
         status = 0
-        psu_status = self.get_pmc_register('psu'+str(index)+'_presence')
+        psu_status = self.get_pmc_register('psu_'+str(index)+'_status')
         if (psu_status != 'ERR'):
             psu_status = int(psu_status, 16)
             # Check for PSU statuse
@@ -70,7 +69,7 @@ def get_psu_presence(self, index):
         :return: Boolean, True if PSU is plugged, False if not
         """
         status = 0
-        psu_presence = self.get_pmc_register('psu'+str(index)+'_presence')
+        psu_presence = self.get_pmc_register('psu_'+str(index)+'_status')
         if (psu_presence != 'ERR'):
             psu_presence = int(psu_presence, 16)
             # Check for PSU presence