Witherspoon: Change hwmon GPU power labels

Match up the GPU power sensor labels with the temperature ones,
so they are both GPU0 through GPU5 instead of P0_GPU0 through
P1_GPU2.

Resolves openbmc/openbmc#3111

Change-Id: I509349049b8528415084e45c09200c16d2628a31
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
diff --git a/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-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 92055f0..3c20335 100644
--- a/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-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
@@ -309,37 +309,37 @@
 CRITHI_power7 = "300000000"
 CRITLO_power7 = "0"
 
-LABEL_power8 = "p0_gpu0_power"
+LABEL_power8 = "gpu0_power"
 WARNHI_power8 = "330000000"
 WARNLO_power8 = "0"
 CRITHI_power8 = "350000000"
 CRITLO_power8 = "0"
 
-LABEL_power9 = "p0_gpu1_power"
+LABEL_power9 = "gpu1_power"
 WARNHI_power9 = "330000000"
 WARNLO_power9 = "0"
 CRITHI_power9 = "350000000"
 CRITLO_power9 = "0"
 
-LABEL_power10 = "p0_gpu2_power"
+LABEL_power10 = "gpu2_power"
 WARNHI_power10 = "330000000"
 WARNLO_power10 = "0"
 CRITHI_power10 = "350000000"
 CRITLO_power10 = "0"
 
-LABEL_power11 = "p1_gpu0_power"
+LABEL_power11 = "gpu3_power"
 WARNHI_power11 = "330000000"
 WARNLO_power11 = "0"
 CRITHI_power11 = "350000000"
 CRITLO_power11 = "0"
 
-LABEL_power12 = "p1_gpu1_power"
+LABEL_power12 = "gpu4_power"
 WARNHI_power12 = "330000000"
 WARNLO_power12 = "0"
 CRITHI_power12 = "350000000"
 CRITLO_power12 = "0"
 
-LABEL_power13 = "p1_gpu2_power"
+LABEL_power13 = "gpu5_power"
 WARNHI_power13 = "330000000"
 WARNLO_power13 = "0"
 CRITHI_power13 = "350000000"