diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
index 3c20335..3d289b8 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
@@ -37,6 +37,22 @@
 MODE_temp37 = "label"
 MODE_temp38 = "label"
 
+MODE_power1 = "function_id"
+MODE_power2 = "function_id"
+MODE_power3 = "function_id"
+MODE_power4 = "function_id"
+MODE_power5 = "function_id"
+MODE_power6 = "function_id"
+MODE_power7 = "function_id"
+MODE_power8 = "function_id"
+MODE_power9 = "function_id"
+MODE_power10 = "function_id"
+MODE_power11 = "function_id"
+MODE_power12 = "function_id"
+MODE_power13 = "function_id"
+MODE_power14 = "function_id"
+MODE_power15 = "function_id"
+
 REMOVERCS = "11"
 
 LABEL_temp17 = "p0_core0_temp"
@@ -267,92 +283,92 @@
 CRITHI_temp205 = "83000"
 CRITLO_temp205 = "0"
 
-LABEL_power1 = "total_power"
-WARNHI_power1 = "3050000000"
-WARNLO_power1 = "0"
-CRITHI_power1 = "3100000000"
-CRITLO_power1 = "0"
+LABEL_power22 = "total_power"
+WARNHI_power22 = "3050000000"
+WARNLO_power22 = "0"
+CRITHI_power22 = "3100000000"
+CRITLO_power22 = "0"
 
-LABEL_power2 = "p0_power"
-WARNHI_power2 = "250000000"
-WARNLO_power2 = "0"
-CRITHI_power2 = "300000000"
-CRITLO_power2 = "0"
-
-LABEL_power3 = "p1_power"
-WARNHI_power3 = "250000000"
-WARNLO_power3 = "0"
-CRITHI_power3 = "300000000"
-CRITLO_power3 = "0"
-
-LABEL_power4 = "p0_io_power"
-WARNHI_power4 = "80000000"
-WARNLO_power4 = "0"
-CRITHI_power4 = "100000000"
-CRITLO_power4 = "0"
-
-LABEL_power5 = "p1_io_power"
-WARNHI_power5 = "80000000"
+LABEL_power5 = "p0_power"
+WARNHI_power5 = "250000000"
 WARNLO_power5 = "0"
-CRITHI_power5 = "100000000"
+CRITHI_power5 = "300000000"
 CRITLO_power5 = "0"
 
-LABEL_power6 = "p0_mem_power"
+LABEL_power6 = "p1_power"
 WARNHI_power6 = "250000000"
 WARNLO_power6 = "0"
 CRITHI_power6 = "300000000"
 CRITLO_power6 = "0"
 
-LABEL_power7 = "p1_mem_power"
-WARNHI_power7 = "250000000"
-WARNLO_power7 = "0"
-CRITHI_power7 = "300000000"
-CRITLO_power7 = "0"
-
-LABEL_power8 = "gpu0_power"
-WARNHI_power8 = "330000000"
-WARNLO_power8 = "0"
-CRITHI_power8 = "350000000"
-CRITLO_power8 = "0"
-
-LABEL_power9 = "gpu1_power"
-WARNHI_power9 = "330000000"
+LABEL_power9 = "p0_io_power"
+WARNHI_power9 = "80000000"
 WARNLO_power9 = "0"
-CRITHI_power9 = "350000000"
+CRITHI_power9 = "100000000"
 CRITLO_power9 = "0"
 
-LABEL_power10 = "gpu2_power"
-WARNHI_power10 = "330000000"
+LABEL_power10 = "p1_io_power"
+WARNHI_power10 = "80000000"
 WARNLO_power10 = "0"
-CRITHI_power10 = "350000000"
+CRITHI_power10 = "100000000"
 CRITLO_power10 = "0"
 
-LABEL_power11 = "gpu3_power"
-WARNHI_power11 = "330000000"
-WARNLO_power11 = "0"
-CRITHI_power11 = "350000000"
-CRITLO_power11 = "0"
+LABEL_power1 = "p0_mem_power"
+WARNHI_power1 = "250000000"
+WARNLO_power1 = "0"
+CRITHI_power1 = "300000000"
+CRITLO_power1 = "0"
 
-LABEL_power12 = "gpu4_power"
-WARNHI_power12 = "330000000"
-WARNLO_power12 = "0"
-CRITHI_power12 = "350000000"
-CRITLO_power12 = "0"
+LABEL_power2 = "p1_mem_power"
+WARNHI_power2 = "250000000"
+WARNLO_power2 = "0"
+CRITHI_power2 = "300000000"
+CRITLO_power2 = "0"
 
-LABEL_power13 = "gpu5_power"
-WARNHI_power13 = "330000000"
+LABEL_power24 = "gpu0_power"
+WARNHI_power24 = "330000000"
+WARNLO_power24 = "0"
+CRITHI_power24 = "350000000"
+CRITLO_power24 = "0"
+
+LABEL_power29 = "gpu1_power"
+WARNHI_power29 = "330000000"
+WARNLO_power29 = "0"
+CRITHI_power29 = "350000000"
+CRITLO_power29 = "0"
+
+LABEL_power30 = "gpu2_power"
+WARNHI_power30 = "330000000"
+WARNLO_power30 = "0"
+CRITHI_power30 = "350000000"
+CRITLO_power30 = "0"
+
+LABEL_power31 = "gpu3_power"
+WARNHI_power31 = "330000000"
+WARNLO_power31 = "0"
+CRITHI_power31 = "350000000"
+CRITLO_power31 = "0"
+
+LABEL_power32 = "gpu4_power"
+WARNHI_power32 = "330000000"
+WARNLO_power32 = "0"
+CRITHI_power32 = "350000000"
+CRITLO_power32 = "0"
+
+LABEL_power33 = "gpu5_power"
+WARNHI_power33 = "330000000"
+WARNLO_power33 = "0"
+CRITHI_power33 = "350000000"
+CRITLO_power33 = "0"
+
+LABEL_power18 = "fan_disk_power"
+WARNHI_power18 = "375000000"
+WARNLO_power18 = "0"
+CRITHI_power18 = "400000000"
+CRITLO_power18 = "0"
+
+LABEL_power13 = "io_power"
+WARNHI_power13 = "128000000"
 WARNLO_power13 = "0"
-CRITHI_power13 = "350000000"
+CRITHI_power13 = "150000000"
 CRITLO_power13 = "0"
-
-LABEL_power14 = "fan_disk_power"
-WARNHI_power14 = "375000000"
-WARNLO_power14 = "0"
-CRITHI_power14 = "400000000"
-CRITLO_power14 = "0"
-
-LABEL_power15 = "io_power"
-WARNHI_power15 = "128000000"
-WARNLO_power15 = "0"
-CRITHI_power15 = "150000000"
-CRITLO_power15 = "0"