diff options
author | Ed Tanous <ed.tanous@intel.com> | 2019-07-31 20:43:37 +0300 |
---|---|---|
committer | Ed Tanous <ed.tanous@intel.com> | 2019-08-01 18:19:38 +0300 |
commit | d0f63ef62c76c932a2003eaa42c0b250065ae06f (patch) | |
tree | 4c0e3cb32dc80f80460bdbf82ff6d401d4ff194f /meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json | |
parent | b4f66bacb1b8e661d794fa7a189e2f66f5092e2e (diff) | |
download | openbmc-d0f63ef62c76c932a2003eaa42c0b250065ae06f.tar.xz |
Update to internal 7-31-19
Signed-off-by: Ed Tanous <ed.tanous@intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json')
-rw-r--r-- | meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json | 69 |
1 files changed, 36 insertions, 33 deletions
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json index 923924a0b..7da6fe261 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json @@ -162,7 +162,12 @@ "Type": "ADC" }, { - "BridgeGpio": 208, + "BridgeGpio": [ + { + "Name": "P3VBAT_BRIDGE_EN", + "Polarity": "High" + } + ], "Index": 7, "Name": "P3VBAT", "ScaleFactor": 0.3333, @@ -656,20 +661,6 @@ "Type": "FanRedundancy" }, { - "Direction": "Out", - "Index": 208, - "Name": "Bridge P3VBAT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 49, - "Name": "CPU CATERR", - "Polarity": "High", - "Type": "Gpio" - }, - { "Direction": "Input", "Index": 214, "Name": "SMI Input", @@ -1183,7 +1174,7 @@ "Outputs": [], "PCoefficient": -0.15, "PositiveHysteresis": 0.0, - "SetPoint": 60.0, + "SetPoint": 65.0, "SlewNeg": -1, "SlewPos": 0.0, "Type": "Pid", @@ -1425,7 +1416,7 @@ "Outputs": [], "PCoefficient": -0.15, "PositiveHysteresis": 0.0, - "SetPoint": 60.0, + "SetPoint": 80.0, "SlewNeg": -1, "SlewPos": 0.0, "Type": "Pid", @@ -1450,7 +1441,7 @@ "Outputs": [], "PCoefficient": -0.15, "PositiveHysteresis": 0.0, - "SetPoint": 60.0, + "SetPoint": 80.0, "SlewNeg": -1, "SlewPos": 0.0, "Type": "Pid", @@ -1476,7 +1467,7 @@ "Outputs": [], "PCoefficient": -0.15, "PositiveHysteresis": 0.0, - "SetPoint": 60.0, + "SetPoint": 80.0, "SlewNeg": -1, "SlewPos": 0.0, "Type": "Pid", @@ -1501,7 +1492,7 @@ "Outputs": [], "PCoefficient": -0.15, "PositiveHysteresis": 0.0, - "SetPoint": 60.0, + "SetPoint": 80.0, "SlewNeg": -1, "SlewPos": 0.0, "Type": "Pid", @@ -1527,7 +1518,7 @@ "Outputs": [], "PCoefficient": -0.15, "PositiveHysteresis": 0.0, - "SetPoint": 60.0, + "SetPoint": 80.0, "SlewNeg": -1, "SlewPos": 0.0, "Type": "Pid", @@ -1553,7 +1544,7 @@ "Outputs": [], "PCoefficient": -0.15, "PositiveHysteresis": 0.0, - "SetPoint": 60.0, + "SetPoint": 80.0, "SlewNeg": -1, "SlewPos": 0.0, "Type": "Pid", @@ -1578,7 +1569,7 @@ "Outputs": [], "PCoefficient": -0.15, "PositiveHysteresis": 0.0, - "SetPoint": 60.0, + "SetPoint": 80.0, "SlewNeg": -1, "SlewPos": 0.0, "Type": "Pid", @@ -1655,7 +1646,7 @@ "Outputs": [], "PCoefficient": -0.15, "PositiveHysteresis": 0.0, - "SetPoint": 60.0, + "SetPoint": 75.0, "SlewNeg": -1, "SlewPos": 0.0, "Type": "Pid", @@ -1672,16 +1663,18 @@ "ILimitMax": 100, "ILimitMin": 30, "Inputs": [ - "VR 1 Temp" + "CPU1 VR Mem ABCD Temp", + "CPU1 VR Mem ABCD Temp", + "CPU1 VR P1V8" ], - "Name": "VR 1 Temp", + "Name": "CPU 1 VR Temp", "NegativeHysteresis": 5.0, "OutLimitMax": 100, "OutLimitMin": 30, "Outputs": [], "PCoefficient": -0.15, "PositiveHysteresis": 0.0, - "SetPoint": 60.0, + "SetPoint": 85.0, "SlewNeg": -1, "SlewPos": 0.0, "Type": "Pid", @@ -1697,16 +1690,18 @@ "ILimitMax": 100, "ILimitMin": 30, "Inputs": [ - "VR 2 Temp" + "CPU2 VR Mem ABCD Temp", + "CPU2 VR Mem ABCD Temp", + "CPU2 VR P1V8" ], - "Name": "VR 2 Temp", + "Name": "CPU 2 VR Temp", "NegativeHysteresis": 5.0, "OutLimitMax": 100, "OutLimitMin": 30, "Outputs": [], "PCoefficient": -0.15, "PositiveHysteresis": 0.0, - "SetPoint": 60.0, + "SetPoint": 85.0, "SlewNeg": -1, "SlewPos": 0.0, "Type": "Pid", @@ -2022,7 +2017,11 @@ } ], "Name": "WP Baseboard", - "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*WP'})", + "Probe": [ + "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'WilsonPoint'})", + "OR", + "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*WP'})" + ], "ProductId": 154, "Type": "Board", "xyz.openbmc_project.Inventory.Decorator.Asset": { @@ -2030,5 +2029,9 @@ "Model": "$PRODUCT_PRODUCT_NAME", "PartNumber": "$PRODUCT_PART_NUMBER", "SerialNumber": "$PRODUCT_SERIAL_NUMBER" - } -} + }, + "xyz.openbmc_project.Inventory.Decorator.AssetTag": { + "AssetTag": "$PRODUCT_ASSET_TAG" + }, + "xyz.openbmc_project.Inventory.Item.System": {} +}
\ No newline at end of file |