meta-quanta: gbs: change VR and NVMe presence sensors name

Change VR and NVMe presence sensors name to make them more
readable

VR:
vddq_abcd_in => vddio_abcd_in
vddq_abcd_out => vddio_abcd_out
vddq_efgh_in => vddio_efgh_in
vddq_efgh_out => vddio_efgh_out
p12v_1_in => p12v_mobo_in
p12v_1_out => p12v_mobo_out
p12v_2_in => p12v_fan_in
p12v_2_out => p12v_fan_out

(From meta-quanta rev: dfef06ba145eb60e59de7d74310489a6c467a75a)

Signed-off-by: George Hung <george.hung@quantatw.com>
Signed-off-by: Brandon Kim <brandonkim@google.com>
Change-Id: Ie40b6eda8eb72b29a015884ec7bfe4fdd5734979
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>

4 files changed, 16 insertions, 16 deletions

diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf
index 757e69950..6fb856335 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf
@@ -1,4 +1,4 @@
-LABEL_in1 = "vddq_efgh_in"
+LABEL_in1 = "vddio_efgh_in"
 CRITHI_in1 = "12600"
 CRITLO_in1 = "11400"
 WARNHI_in1 = "12600"
@@ -9,7 +9,7 @@ MAXVALUE_in1 = "14"
 GAIN_in1 = "10.0"
 PWRONMON_in1 = "ON"
 
-LABEL_in2 = "vddq_efgh_out"
+LABEL_in2 = "vddio_efgh_out"
 CRITHI_in2 = "1320"
 CRITLO_in2 = "800"
 WARNHI_in2 = "1320"
@@ -18,7 +18,7 @@ MINVALUE_in2 = "0"
 MAXVALUE_in2 = "2"
 PWRONMON_in2 = "ON"
 
-LABEL_curr1 = "vddq_efgh_in"
+LABEL_curr1 = "vddio_efgh_in"
 CRITHI_curr1 = "8400"
 CRITLO_curr1 = "0"
 WARNHI_curr1 = "8400"
@@ -27,7 +27,7 @@ MINVALUE_curr1 = "0"
 MAXVALUE_curr1 = "9"
 PWRONMON_curr1 = "ON"
 
-LABEL_curr2 = "vddq_efgh_out"
+LABEL_curr2 = "vddio_efgh_out"
 CRITHI_curr2 = "84000"
 CRITLO_curr2 = "0"
 WARNHI_curr2 = "84000"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf
index df12a20c4..5c484c53d 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf
@@ -1,4 +1,4 @@
-LABEL_in1 = "vddq_abcd_in"
+LABEL_in1 = "vddio_abcd_in"
 CRITHI_in1 = "12600"
 CRITLO_in1 = "11400"
 WARNHI_in1 = "12600"
@@ -9,7 +9,7 @@ MAXVALUE_in1 = "14"
 GAIN_in1 = "10.0"
 PWRONMON_in1 = "ON"
 
-LABEL_in2 = "vddq_abcd_out"
+LABEL_in2 = "vddio_abcd_out"
 CRITHI_in2 = "1320"
 CRITLO_in2 = "800"
 WARNHI_in2 = "1320"
@@ -18,7 +18,7 @@ MINVALUE_in2 = "0"
 MAXVALUE_in2 = "2"
 PWRONMON_in2 = "ON"
 
-LABEL_curr1 = "vddq_abcd_in"
+LABEL_curr1 = "vddio_abcd_in"
 CRITHI_curr1 = "8400"
 CRITLO_curr1 = "0"
 WARNHI_curr1 = "8400"
@@ -27,7 +27,7 @@ MINVALUE_curr1 = "0"
 MAXVALUE_curr1 = "9"
 PWRONMON_curr1 = "ON"
 
-LABEL_curr2 = "vddq_abcd_out"
+LABEL_curr2 = "vddio_abcd_out"
 CRITHI_curr2 = "84000"
 CRITLO_curr2 = "0"
 WARNHI_curr2 = "84000"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf
index 530d36f1a..c5f694af6 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf
@@ -1,4 +1,4 @@
-LABEL_in1 = "p12v_2_in"
+LABEL_in1 = "p12v_fan_in"
 CRITHI_in1 = "60000"
 CRITLO_in1 = "40000"
 WARNHI_in1 = "60000"
@@ -9,7 +9,7 @@ MAXVALUE_in1 = "65"
 GAIN_in1 = "100.0"
 PWRONMON_in1 = "ON"
 
-LABEL_in2 = "p12v_2_out"
+LABEL_in2 = "p12v_fan_out"
 CRITHI_in2 = "12600"
 CRITLO_in2 = "11400"
 WARNHI_in2 = "12600"
@@ -20,7 +20,7 @@ MAXVALUE_in2 = "14"
 GAIN_in2 = "5.02"
 PWRONMON_in2 = "ON"
 
-LABEL_curr1 = "p12v_2_in"
+LABEL_curr1 = "p12v_fan_in"
 CRITHI_curr1 = "22000"
 CRITLO_curr1 = "0"
 WARNHI_curr1 = "22000"
@@ -29,7 +29,7 @@ MINVALUE_curr1 = "0"
 MAXVALUE_curr1 = "35"
 PWRONMON_curr1 = "ON"
 
-LABEL_curr2 = "p12v_2_out"
+LABEL_curr2 = "p12v_fan_out"
 CRITHI_curr2 = "88000"
 CRITLO_curr2 = "0"
 WARNHI_curr2 = "88000"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5e.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5e.conf
index 59bf25511..a8e92ef75 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5e.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5e.conf
@@ -1,4 +1,4 @@
-LABEL_in1 = "p12v_1_in"
+LABEL_in1 = "p12v_mobo_in"
 CRITHI_in1 = "60000"
 CRITLO_in1 = "40000"
 WARNHI_in1 = "60000"
@@ -9,7 +9,7 @@ MAXVALUE_in1 = "65"
 GAIN_in1 = "100.0"
 PWRONMON_in1 = "ON"
 
-LABEL_in2 = "p12v_1_out"
+LABEL_in2 = "p12v_mobo_out"
 CRITHI_in2 = "12600"
 CRITLO_in2 = "11400"
 WARNHI_in2 = "12600"
@@ -20,7 +20,7 @@ MAXVALUE_in2 = "14"
 GAIN_in2 = "5.02"
 PWRONMON_in2 = "ON"
 
-LABEL_curr1 = "p12v_1_in"
+LABEL_curr1 = "p12v_mobo_in"
 CRITHI_curr1 = "30000"
 CRITLO_curr1 = "0"
 WARNHI_curr1 = "30000"
@@ -29,7 +29,7 @@ MINVALUE_curr1 = "0"
 MAXVALUE_curr1 = "35"
 PWRONMON_curr1 = "ON"
 
-LABEL_curr2 = "p12v_1_out"
+LABEL_curr2 = "p12v_mobo_out"
 CRITHI_curr2 = "100000"
 CRITLO_curr2 = "0"
 WARNHI_curr2 = "100000"