From 7c37c8ecd10d232c43ad9831257838cd6d75f683 Mon Sep 17 00:00:00 2001 From: "Jason M. Bills" Date: Mon, 16 Mar 2020 12:50:26 -0700 Subject: Update to internal 0.44 Signed-off-by: Jason M. Bills --- .../entity-manager/CPC-Baseboard.json | 14 +++++++- .../configuration/entity-manager/WP-Baseboard.json | 38 +++++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-) (limited to 'meta-openbmc-mods/meta-ast2500') diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CPC-Baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CPC-Baseboard.json index 71ea74135..80d4606bb 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CPC-Baseboard.json +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CPC-Baseboard.json @@ -990,6 +990,18 @@ "Name": "M2 Mux", "Type": "PCA9543Mux" }, + { + "Address": "0x72", + "Bus": 7, + "ChannelNames": [ + "PMBusSlot1", + "PMBusSlot2", + "PMBusSlot3", + "PMBusSlot4" + ], + "Name": "PMBus Mux", + "Type": "PCA9544Mux" + }, { "Address": "0x72", "Bus": 2, @@ -1885,6 +1897,6 @@ }, "xyz.openbmc_project.Inventory.Item.Board.Motherboard": { "ProductId": 157 -}, + }, "xyz.openbmc_project.Inventory.Item.System": {} } \ No newline at end of file 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 de98c78fa..02929fb33 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 @@ -627,6 +627,7 @@ "I2cAddress": "0xB0", "I2cbus": "MemoryChannel1", "Imc": 0, + "Pecibus": "0x30", "Slot": 0, "Socket": 0, "Spdpcibus": "0x7E", @@ -642,6 +643,7 @@ "I2cAddress": "0xB2", "I2cbus": "MemoryChannel1", "Imc": 0, + "Pecibus": "0x30", "Slot": 1, "Socket": 0, "Spdpcibus": "0x7E", @@ -657,6 +659,7 @@ "I2cAddress": "0xB4", "I2cbus": "MemoryChannel1", "Imc": 0, + "Pecibus": "0x30", "Slot": 0, "Socket": 0, "Spdpcibus": "0x7E", @@ -672,6 +675,7 @@ "I2cAddress": "0xB6", "I2cbus": "MemoryChannel1", "Imc": 0, + "Pecibus": "0x30", "Slot": 1, "Socket": 0, "Spdpcibus": "0x7E", @@ -687,6 +691,7 @@ "I2cAddress": "0xB8", "I2cbus": "MemoryChannel1", "Imc": 1, + "Pecibus": "0x30", "Slot": 0, "Socket": 0, "Spdpcibus": "0x7E", @@ -702,6 +707,7 @@ "I2cAddress": "0xBA", "I2cbus": "MemoryChannel1", "Imc": 1, + "Pecibus": "0x30", "Slot": 1, "Socket": 0, "Spdpcibus": "0x7E", @@ -717,6 +723,7 @@ "I2cAddress": "0xBC", "I2cbus": "MemoryChannel1", "Imc": 1, + "Pecibus": "0x30", "Slot": 0, "Socket": 0, "Spdpcibus": "0x7E", @@ -732,6 +739,7 @@ "I2cAddress": "0xBE", "I2cbus": "MemoryChannel1", "Imc": 1, + "Pecibus": "0x30", "Slot": 1, "Socket": 0, "Spdpcibus": "0x7E", @@ -747,6 +755,7 @@ "I2cAddress": "0xB0", "I2cbus": "MemoryChannel2", "Imc": 2, + "Pecibus": "0x30", "Slot": 0, "Socket": 0, "Spdpcibus": "0x7E", @@ -762,6 +771,7 @@ "I2cAddress": "0xB2", "I2cbus": "MemoryChannel2", "Imc": 2, + "Pecibus": "0x30", "Slot": 1, "Socket": 0, "Spdpcibus": "0x7E", @@ -777,6 +787,7 @@ "I2cAddress": "0xB4", "I2cbus": "MemoryChannel2", "Imc": 2, + "Pecibus": "0x30", "Slot": 0, "Socket": 0, "Spdpcibus": "0x7E", @@ -792,6 +803,7 @@ "I2cAddress": "0xB6", "I2cbus": "MemoryChannel2", "Imc": 2, + "Pecibus": "0x30", "Slot": 1, "Socket": 0, "Spdpcibus": "0x7E", @@ -807,6 +819,7 @@ "I2cAddress": "0xB8", "I2cbus": "MemoryChannel2", "Imc": 3, + "Pecibus": "0x30", "Slot": 0, "Socket": 0, "Spdpcibus": "0x7E", @@ -822,6 +835,7 @@ "I2cAddress": "0xBA", "I2cbus": "MemoryChannel2", "Imc": 3, + "Pecibus": "0x30", "Slot": 1, "Socket": 0, "Spdpcibus": "0x7E", @@ -837,6 +851,7 @@ "I2cAddress": "0xBC", "I2cbus": "MemoryChannel2", "Imc": 3, + "Pecibus": "0x30", "Slot": 0, "Socket": 0, "Spdpcibus": "0x7E", @@ -852,6 +867,7 @@ "I2cAddress": "0xBE", "I2cbus": "MemoryChannel2", "Imc": 3, + "Pecibus": "0x30", "Slot": 1, "Socket": 0, "Spdpcibus": "0x7E", @@ -867,6 +883,7 @@ "I2cAddress": "0xB0", "I2cbus": "MemoryChannel3", "Imc": 0, + "Pecibus": "0x31", "Slot": 0, "Socket": 1, "Spdpcibus": "0x7E", @@ -882,6 +899,7 @@ "I2cAddress": "0xB2", "I2cbus": "MemoryChannel3", "Imc": 0, + "Pecibus": "0x31", "Slot": 1, "Socket": 1, "Spdpcibus": "0x7E", @@ -897,6 +915,7 @@ "I2cAddress": "0xB4", "I2cbus": "MemoryChannel3", "Imc": 0, + "Pecibus": "0x31", "Slot": 0, "Socket": 1, "Spdpcibus": "0x7E", @@ -912,6 +931,7 @@ "I2cAddress": "0xB6", "I2cbus": "MemoryChannel3", "Imc": 0, + "Pecibus": "0x31", "Slot": 1, "Socket": 1, "Spdpcibus": "0x7E", @@ -927,6 +947,7 @@ "I2cAddress": "0xB8", "I2cbus": "MemoryChannel3", "Imc": 1, + "Pecibus": "0x31", "Slot": 0, "Socket": 1, "Spdpcibus": "0x7E", @@ -942,6 +963,7 @@ "I2cAddress": "0xBA", "I2cbus": "MemoryChannel3", "Imc": 1, + "Pecibus": "0x31", "Slot": 1, "Socket": 1, "Spdpcibus": "0x7E", @@ -957,6 +979,7 @@ "I2cAddress": "0xBC", "I2cbus": "MemoryChannel3", "Imc": 1, + "Pecibus": "0x31", "Slot": 0, "Socket": 1, "Spdpcibus": "0x7E", @@ -972,6 +995,7 @@ "I2cAddress": "0xBE", "I2cbus": "MemoryChannel3", "Imc": 1, + "Pecibus": "0x31", "Slot": 1, "Socket": 1, "Spdpcibus": "0x7E", @@ -987,6 +1011,7 @@ "I2cAddress": "0xB0", "I2cbus": "MemoryChannel4", "Imc": 2, + "Pecibus": "0x31", "Slot": 0, "Socket": 1, "Spdpcibus": "0x7E", @@ -1002,6 +1027,7 @@ "I2cAddress": "0xB2", "I2cbus": "MemoryChannel4", "Imc": 2, + "Pecibus": "0x31", "Slot": 1, "Socket": 1, "Spdpcibus": "0x7E", @@ -1017,6 +1043,7 @@ "I2cAddress": "0xB4", "I2cbus": "MemoryChannel4", "Imc": 2, + "Pecibus": "0x31", "Slot": 0, "Socket": 1, "Spdpcibus": "0x7E", @@ -1032,6 +1059,7 @@ "I2cAddress": "0xB6", "I2cbus": "MemoryChannel4", "Imc": 2, + "Pecibus": "0x31", "Slot": 1, "Socket": 1, "Spdpcibus": "0x7E", @@ -1047,6 +1075,7 @@ "I2cAddress": "0xB8", "I2cbus": "MemoryChannel4", "Imc": 3, + "Pecibus": "0x31", "Slot": 0, "Socket": 1, "Spdpcibus": "0x7E", @@ -1062,6 +1091,7 @@ "I2cAddress": "0xBA", "I2cbus": "MemoryChannel4", "Imc": 3, + "Pecibus": "0x31", "Slot": 1, "Socket": 1, "Spdpcibus": "0x7E", @@ -1077,6 +1107,7 @@ "I2cAddress": "0xBC", "I2cbus": "MemoryChannel4", "Imc": 3, + "Pecibus": "0x31", "Slot": 0, "Socket": 1, "Spdpcibus": "0x7E", @@ -1092,6 +1123,7 @@ "I2cAddress": "0xBE", "I2cbus": "MemoryChannel4", "Imc": 3, + "Pecibus": "0x31", "Slot": 1, "Socket": 1, "Spdpcibus": "0x7E", @@ -1102,6 +1134,10 @@ "Spdpcistatusregister": "0x84" } ], + "Interface": [ + "i2c", + "peci" + ], "Name": "DCPMM", "Type": "DCPMM" }, @@ -2376,4 +2412,4 @@ "ProductId": 154 }, "xyz.openbmc_project.Inventory.Item.System": {} -} \ No newline at end of file +} -- cgit v1.2.3