Update 4-15-19

Signed-off-by: Ed Tanous <ed.tanous@intel.com>

1 files changed, 90 insertions, 20 deletions

diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json
index bd32ae60d..e1e877892 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json
+++ b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json
@@ -330,7 +330,7 @@
         },
         {
             "Index": 8,
-            "Name": "PVCCIN_CPU0",
+            "Name": "PVCCIN_CPU1",
             "PowerState": "On",
             "ScaleFactor": 0.7505,
             "Thresholds": [
@@ -363,7 +363,7 @@
         },
         {
             "Index": 9,
-            "Name": "PVCCIN_CPU1",
+            "Name": "PVCCIN_CPU2",
             "PowerState": "On",
             "ScaleFactor": 0.7505,
             "Thresholds": [
@@ -396,7 +396,7 @@
         },
         {
             "Index": 14,
-            "Name": "PVCCIO_CPU0",
+            "Name": "PVCCIO_CPU1",
             "PowerState": "On",
             "Thresholds": [
                 {
@@ -428,7 +428,7 @@
         },
         {
             "Index": 15,
-            "Name": "PVCCIO_CPU1",
+            "Name": "PVCCIO_CPU2",
             "PowerState": "On",
             "Thresholds": [
                 {
@@ -460,7 +460,7 @@
         },
         {
             "Index": 10,
-            "Name": "PVDQ_ABC_CPU0",
+            "Name": "PVDQ_ABC_CPU1",
             "PowerState": "On",
             "Thresholds": [
                 {
@@ -492,7 +492,7 @@
         },
         {
             "Index": 12,
-            "Name": "PVDQ_ABC_CPU1",
+            "Name": "PVDQ_ABC_CPU2",
             "PowerState": "On",
             "Thresholds": [
                 {
@@ -524,7 +524,7 @@
         },
         {
             "Index": 11,
-            "Name": "PVDQ_DEF_CPU0",
+            "Name": "PVDQ_DEF_CPU1",
             "PowerState": "On",
             "Thresholds": [
                 {
@@ -556,7 +556,7 @@
         },
         {
             "Index": 13,
-            "Name": "PVDQ_DEF_CPU1",
+            "Name": "PVDQ_DEF_CPU2",
             "PowerState": "On",
             "Thresholds": [
                 {
@@ -748,8 +748,8 @@
         {
             "Address": "0x30",
             "Bus": 0,
-            "CpuID": 0,
-            "Name": "Skylake CPU 0",
+            "CpuID": 1,
+            "Name": "Skylake CPU 1",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -771,8 +771,8 @@
         {
             "Address": "0x31",
             "Bus": 0,
-            "CpuID": 1,
-            "Name": "Skylake CPU 1",
+            "CpuID": 2,
+            "Name": "Skylake CPU 2",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -1142,13 +1142,13 @@
         },
         {
             "FailSafePercent": 100,
-            "MinThermalRpm": 3000,
+            "MinThermalOutput": 30,
             "Name": "Left",
             "Type": "Pid.Zone"
         },
         {
             "FailSafePercent": 100,
-            "MinThermalRpm": 3000,
+            "MinThermalOutput": 30,
             "Name": "Right",
             "Type": "Pid.Zone"
         },
@@ -1165,9 +1165,9 @@
             "ILimitMax": 100,
             "ILimitMin": 30,
             "Inputs": [
-                "Core \\d+ CPU0"
+                "Core \\d+ CPU1"
             ],
-            "Name": "CPU0",
+            "Name": "CPU1",
             "NegativeHysteresis": 2.0,
             "OutLimitMax": 100,
             "OutLimitMin": 30,
@@ -1190,9 +1190,9 @@
             "ILimitMax": 100,
             "ILimitMin": 30,
             "Inputs": [
-                "Core \\d+ CPU1"
+                "Core \\d+ CPU2"
             ],
-            "Name": "CPU1",
+            "Name": "CPU2",
             "OutLimitMax": 100,
             "OutLimitMin": 30,
             "Outputs": [],
@@ -1206,7 +1206,42 @@
             ]
         },
         {
-            "Direction": "In",
+            "Direction": "Input",
+            "Index": 32,
+            "Name": "Reset Button",
+            "Polarity": "Low",
+            "Type": "Gpio"
+        },
+        {
+            "Direction": "Out",
+            "Index": 33,
+            "Name": "Reset Out",
+            "Polarity": "Low",
+            "Type": "Gpio"
+        },
+        {
+            "Direction": "Input",
+            "Index": 34,
+            "Name": "Power Button",
+            "Polarity": "Low",
+            "Type": "Gpio"
+        },
+        {
+            "Direction": "Out",
+            "Index": 35,
+            "Name": "Power Up",
+            "Polarity": "Low",
+            "Type": "Gpio"
+        },
+        {
+            "Direction": "Input",
+            "Index": 40,
+            "Name": "NMI Input",
+            "Polarity": "Low",
+            "Type": "Gpio"
+        },
+        {
+            "Direction": "Input",
             "Index": 48,
             "Name": "CPU ERR2",
             "Polarity": "High",
@@ -1220,6 +1255,41 @@
             "Type": "Gpio"
         },
         {
+            "Direction": "Input",
+            "Index": 214,
+            "Name": "SMI Input",
+            "Polarity": "High",
+            "Type": "Gpio"
+        },
+        {
+            "Direction": "Input",
+            "Index": 215,
+            "Name": "Post Complete",
+            "Polarity": "Low",
+            "Type": "Gpio"
+        },
+        {
+            "Direction": "Input",
+            "Index": 217,
+            "Name": "Nmi Button",
+            "Polarity": "High",
+            "Type": "Gpio"
+        },
+        {
+            "Direction": "Input",
+            "Index": 218,
+            "Name": "ID Button",
+            "Polarity": "Low",
+            "Type": "Gpio"
+        },
+        {
+            "Direction": "Input",
+            "Index": 219,
+            "Name": "Power Good",
+            "Polarity": "High",
+            "Type": "Gpio"
+        },
+        {
             "Class": "Floor",
             "Inputs": [
                 "Front Panel Temp"
@@ -1731,4 +1801,4 @@
         "PartNumber": "$PRODUCT_PART_NUMBER",
         "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
     }
-}
\ No newline at end of file
+}