ibm:everest: New device callouts JSON file

This fixes power supply addresses.

Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: I36cfa1097590d01ea26953c3d32f4aec8d3aff7d
diff --git a/meta-ibm/recipes-phosphor/logging/phosphor-logging/p10bmc/ibm,everest_dev_callouts.json b/meta-ibm/recipes-phosphor/logging/phosphor-logging/p10bmc/ibm,everest_dev_callouts.json
index b554fd4..a404553 100644
--- a/meta-ibm/recipes-phosphor/logging/phosphor-logging/p10bmc/ibm,everest_dev_callouts.json
+++ b/meta-ibm/recipes-phosphor/logging/phosphor-logging/p10bmc/ibm,everest_dev_callouts.json
@@ -37153,11 +37153,6 @@
                   "LocationCode":"E0",
                   "Name":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0/power-supply-conn-0/power-supply-0",
                   "Priority":"H"
-               },
-               {
-                  "LocationCode":"P0-P2",
-                  "Name":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0",
-                  "Priority":"L"
                }
             ],
             "Dest":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0/power-supply-conn-0/power-supply-0/power-supply-blackbox-0",
@@ -37176,40 +37171,12 @@
                   "LocationCode":"E1",
                   "Name":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0/power-supply-conn-1/power-supply-0",
                   "Priority":"H"
-               },
-               {
-                  "LocationCode":"P0-P2",
-                  "Name":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0",
-                  "Priority":"L"
                }
             ],
             "Dest":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0/power-supply-conn-1/power-supply-0/power-supply-blackbox-0",
             "HexAddress":"0x69",
             "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0"
          },
-         "106":{
-            "Callouts":[
-               {
-                  "LocationCode":"P0-C0",
-                  "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0",
-                  "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0",
-                  "Priority":"H"
-               },
-               {
-                  "LocationCode":"E2",
-                  "Name":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0/power-supply-conn-2/power-supply-0",
-                  "Priority":"H"
-               },
-               {
-                  "LocationCode":"P0-P2",
-                  "Name":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0",
-                  "Priority":"L"
-               }
-            ],
-            "Dest":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0/power-supply-conn-2/power-supply-0/power-supply-blackbox-0",
-            "HexAddress":"0x6a",
-            "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0"
-         },
          "107":{
             "Callouts":[
                {
@@ -37222,17 +37189,30 @@
                   "LocationCode":"E3",
                   "Name":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0/power-supply-conn-3/power-supply-0",
                   "Priority":"H"
-               },
-               {
-                  "LocationCode":"P0-P2",
-                  "Name":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0",
-                  "Priority":"L"
                }
             ],
             "Dest":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0/power-supply-conn-3/power-supply-0/power-supply-blackbox-0",
             "HexAddress":"0x6b",
             "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0"
          },
+         "109":{
+            "Callouts":[
+               {
+                  "LocationCode":"P0-C0",
+                  "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0",
+                  "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0",
+                  "Priority":"H"
+               },
+               {
+                  "LocationCode":"E2",
+                  "Name":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0/power-supply-conn-2/power-supply-0",
+                  "Priority":"H"
+               }
+            ],
+            "Dest":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0/power-supply-conn-2/power-supply-0/power-supply-blackbox-0",
+            "HexAddress":"0x6d",
+            "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0"
+         },
          "22":{
             "Callouts":[
                {