pseq: Use more concise bracketing style in config
Per previous review suggestion and to improve readability, use a more
concise bracketing style in configuration files.
Signed-off-by: Jim Wright <jlwright@us.ibm.com>
Change-Id: I1dc8d97c7251eb49e8c13c71c4a33a67d315f7a0
diff --git a/phosphor-power-sequencer/config_files/UCD90320Monitor_ibm,everest.json b/phosphor-power-sequencer/config_files/UCD90320Monitor_ibm,everest.json
index 7e50882..9b45ba8 100644
--- a/phosphor-power-sequencer/config_files/UCD90320Monitor_ibm,everest.json
+++ b/phosphor-power-sequencer/config_files/UCD90320Monitor_ibm,everest.json
@@ -1,102 +1,40 @@
{
"rails": [
- {
- "name": "12.0V"
- },
- {
- "name": "3V3IO"
- },
- {
- "name": "CP0_VDD0"
- },
- {
- "name": "CP0_VDD1"
- },
- {
- "name": "CP1_VDD0"
- },
- {
- "name": "CP1_VDD1"
- },
- {
- "name": "CP2_VDD0"
- },
- {
- "name": "CP2_VDD1"
- },
- {
- "name": "CP3_VDD0"
- },
- {
- "name": "CP3_VDD1"
- },
- {
- "name": "CP0_VCS0"
- },
- {
- "name": "CP0_VCS1"
- },
- {
- "name": "CP1_VCS0"
- },
- {
- "name": "CP1_VCS1"
- },
- {
- "name": "CP2_VCS0"
- },
+ { "name": "12.0V" },
+ { "name": "3V3IO" },
+ { "name": "CP0_VDD0" },
+ { "name": "CP0_VDD1" },
+ { "name": "CP1_VDD0" },
+ { "name": "CP1_VDD1" },
+ { "name": "CP2_VDD0" },
+ { "name": "CP2_VDD1" },
+ { "name": "CP3_VDD0" },
+ { "name": "CP3_VDD1" },
+ { "name": "CP0_VCS0" },
+ { "name": "CP0_VCS1" },
+ { "name": "CP1_VCS0" },
+ { "name": "CP1_VCS1" },
+ { "name": "CP2_VCS0" },
{
"name": "CP2_VCS1",
"presence": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm2/cpu0"
},
- {
- "name": "CP3_VCS0"
- },
- {
- "name": "CP3_VCS1"
- },
- {
- "name": "CP03_AVDD"
- },
- {
- "name": "CP12_AVDD"
- },
- {
- "name": "CP0_VDN"
- },
- {
- "name": "CP1_VDN"
- },
- {
- "name": "CP2_VDN"
- },
- {
- "name": "CP3_VDN"
- },
- {
- "name": "CP0_VIO"
- },
- {
- "name": "CP1_VIO"
- },
- {
- "name": "CP2_VIO"
- },
- {
- "name": "CP3_VIO"
- },
- {
- "name": "CP0_VPCIE"
- },
- {
- "name": "CP1_VPCIE"
- },
- {
- "name": "CP2_VPCIE"
- },
- {
- "name": "CP3_VPCIE"
- }
+ { "name": "CP3_VCS0" },
+ { "name": "CP3_VCS1" },
+ { "name": "CP03_AVDD" },
+ { "name": "CP12_AVDD" },
+ { "name": "CP0_VDN" },
+ { "name": "CP1_VDN" },
+ { "name": "CP2_VDN" },
+ { "name": "CP3_VDN" },
+ { "name": "CP0_VIO" },
+ { "name": "CP1_VIO" },
+ { "name": "CP2_VIO" },
+ { "name": "CP3_VIO" },
+ { "name": "CP0_VPCIE" },
+ { "name": "CP1_VPCIE" },
+ { "name": "CP2_VPCIE" },
+ { "name": "CP3_VPCIE" }
],
"pins": [
diff --git a/phosphor-power-sequencer/config_files/UCD90320Monitor_ibm,rainier.json b/phosphor-power-sequencer/config_files/UCD90320Monitor_ibm,rainier.json
index f184c45..d8b4f60 100644
--- a/phosphor-power-sequencer/config_files/UCD90320Monitor_ibm,rainier.json
+++ b/phosphor-power-sequencer/config_files/UCD90320Monitor_ibm,rainier.json
@@ -1,101 +1,37 @@
{
"rails": [
- {
- "name": "12.0V"
- },
- {
- "name": "5.0V_USB"
- },
- {
- "name": "5.0V_DASD"
- },
- {
- "name": "3.3VA"
- },
- {
- "name": "3.3VB"
- },
- {
- "name": "1.5V"
- },
- {
- "name": "1.1V"
- },
- {
- "name": "VDDA_DCM0"
- },
- {
- "name": "VDDB_DCM0"
- },
- {
- "name": "VDDA_DCM1"
- },
- {
- "name": "VDDB_DCM1"
- },
- {
- "name": "12.0VCS"
- },
- {
- "name": "3.3VCS"
- },
- {
- "name": "1.1V_Current"
- },
- {
- "name": "5.0V_USB_Current"
- },
- {
- "name": "5.0V_DASD_Current"
- },
- {
- "name": "12.0VN"
- },
- {
- "name": "12.0VP"
- },
- {
- "name": "12.0VQ"
- },
- {
- "name": "12.0VR"
- },
- {
- "name": "ThermalDiode1"
- },
- {
- "name": "ThermalDiode2"
- },
- {
- "name": "ThermalDiode3"
- },
- {
- "name": "ThermalDiode4"
- },
- {
- "name": "VDN_DCM0"
- },
- {
- "name": "VDN_DCM1"
- },
- {
- "name": "VCS_DCM0"
- },
- {
- "name": "VCS_DCM1"
- },
- {
- "name": "VIO_DCM0"
- },
- {
- "name": "VIO_DCM1"
- },
- {
- "name": "VPCIE_DCM0"
- },
- {
- "name": "VPCIE_DCM1"
- }
+ { "name": "12.0V" },
+ { "name": "5.0V_USB" },
+ { "name": "5.0V_DASD" },
+ { "name": "3.3VA" },
+ { "name": "3.3VB" },
+ { "name": "1.5V" },
+ { "name": "1.1V" },
+ { "name": "VDDA_DCM0" },
+ { "name": "VDDB_DCM0" },
+ { "name": "VDDA_DCM1" },
+ { "name": "VDDB_DCM1" },
+ { "name": "12.0VCS" },
+ { "name": "3.3VCS" },
+ { "name": "1.1V_Current" },
+ { "name": "5.0V_USB_Current" },
+ { "name": "5.0V_DASD_Current" },
+ { "name": "12.0VN" },
+ { "name": "12.0VP" },
+ { "name": "12.0VQ" },
+ { "name": "12.0VR" },
+ { "name": "ThermalDiode1" },
+ { "name": "ThermalDiode2" },
+ { "name": "ThermalDiode3" },
+ { "name": "ThermalDiode4" },
+ { "name": "VDN_DCM0" },
+ { "name": "VDN_DCM1" },
+ { "name": "VCS_DCM0" },
+ { "name": "VCS_DCM1" },
+ { "name": "VIO_DCM0" },
+ { "name": "VIO_DCM1" },
+ { "name": "VPCIE_DCM0" },
+ { "name": "VPCIE_DCM1" }
],
"pins": [