From adba73526790154a7d2edd31787e03d394365934 Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Thu, 25 Mar 2021 17:20:11 +0000 Subject: ibm: power: Replace rainier with p10bmc The IBM rainier machine name is being replaced with the generic p10bmc. Change-Id: I8dece8c720fd520de7a6857a7311b62a65c054ba Signed-off-by: Adriana Kobylak --- .../power/phosphor-power/p10bmc/psu.json | 31 ++++ .../power/phosphor-power/rainier/psu.json | 31 ---- .../power/phosphor-power_%.bbappend | 4 +- meta-ibm/recipes-phosphor/power/power-sequencer.bb | 6 +- .../power/power-sequencer/p10bmc/ucd90160.yaml | 201 +++++++++++++++++++++ .../power/power-sequencer/rainier/ucd90160.yaml | 201 --------------------- 6 files changed, 237 insertions(+), 237 deletions(-) create mode 100644 meta-ibm/recipes-phosphor/power/phosphor-power/p10bmc/psu.json delete mode 100644 meta-ibm/recipes-phosphor/power/phosphor-power/rainier/psu.json create mode 100644 meta-ibm/recipes-phosphor/power/power-sequencer/p10bmc/ucd90160.yaml delete mode 100644 meta-ibm/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml (limited to 'meta-ibm') diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power/p10bmc/psu.json b/meta-ibm/recipes-phosphor/power/phosphor-power/p10bmc/psu.json new file mode 100644 index 000000000..baa96ac27 --- /dev/null +++ b/meta-ibm/recipes-phosphor/power/phosphor-power/p10bmc/psu.json @@ -0,0 +1,31 @@ +{ + "inventoryPMBusAccessType": "HwmonDeviceDebug", + "fruConfigs": [ + { + "propertyName": "PartNumber", + "fileName": "part_number", + "interface": "xyz.openbmc_project.Inventory.Decorator.Asset" + }, + { + "propertyName": "SerialNumber", + "fileName": "serial_number", + "interface": "xyz.openbmc_project.Inventory.Decorator.Asset" + }, + { + "propertyName": "Model", + "fileName": "ccin", + "interface": "xyz.openbmc_project.Inventory.Decorator.Asset" + }, + { + "propertyName": "Version", + "fileName": "fw_version", + "interface": "xyz.openbmc_project.Software.Version" + } + ], + "psuDevices": { + "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0" : "/sys/bus/i2c/devices/3-0068", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1" : "/sys/bus/i2c/devices/3-0069", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply2" : "/sys/bus/i2c/devices/3-006a", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply3" : "/sys/bus/i2c/devices/3-006b" + } +} diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power/rainier/psu.json b/meta-ibm/recipes-phosphor/power/phosphor-power/rainier/psu.json deleted file mode 100644 index baa96ac27..000000000 --- a/meta-ibm/recipes-phosphor/power/phosphor-power/rainier/psu.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "inventoryPMBusAccessType": "HwmonDeviceDebug", - "fruConfigs": [ - { - "propertyName": "PartNumber", - "fileName": "part_number", - "interface": "xyz.openbmc_project.Inventory.Decorator.Asset" - }, - { - "propertyName": "SerialNumber", - "fileName": "serial_number", - "interface": "xyz.openbmc_project.Inventory.Decorator.Asset" - }, - { - "propertyName": "Model", - "fileName": "ccin", - "interface": "xyz.openbmc_project.Inventory.Decorator.Asset" - }, - { - "propertyName": "Version", - "fileName": "fw_version", - "interface": "xyz.openbmc_project.Software.Version" - } - ], - "psuDevices": { - "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0" : "/sys/bus/i2c/devices/3-0068", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1" : "/sys/bus/i2c/devices/3-0069", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply2" : "/sys/bus/i2c/devices/3-006a", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply3" : "/sys/bus/i2c/devices/3-006b" - } -} diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend index 3c652cee9..c8084b39e 100644 --- a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend @@ -5,11 +5,11 @@ inherit obmc-phosphor-systemd SRC_URI += "file://psu.json" EXTRA_OEMESON_append_ibm-ac-server = " -Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" -EXTRA_OEMESON_append_rainier = " -Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml -Dibm-vpd=true" +EXTRA_OEMESON_append_p10bmc = " -Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml -Dibm-vpd=true" EXTRA_OEMESON_append_mihawk = " -Dpower_sequencer=mihawk-cpld" DEPENDS_append_ibm-ac-server = " power-sequencer" -DEPENDS_append_rainier = " power-sequencer" +DEPENDS_append_p10bmc = " power-sequencer" do_install_append(){ install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json diff --git a/meta-ibm/recipes-phosphor/power/power-sequencer.bb b/meta-ibm/recipes-phosphor/power/power-sequencer.bb index cd5822202..6fc1133cf 100644 --- a/meta-ibm/recipes-phosphor/power/power-sequencer.bb +++ b/meta-ibm/recipes-phosphor/power/power-sequencer.bb @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch SRC_URI_append_ibm-ac-server = " file://ucd90160.yaml" -SRC_URI_append_rainier = " file://ucd90160.yaml" +SRC_URI_append_p10bmc = " file://ucd90160.yaml" FILES_${PN}_append_ibm-ac-server = " ${datadir}/power-sequencer/ucd90160.yaml" -FILES_${PN}_append_rainier = " ${datadir}/power-sequencer/ucd90160.yaml" +FILES_${PN}_append_p10bmc = " ${datadir}/power-sequencer/ucd90160.yaml" S = "${WORKDIR}" @@ -19,7 +19,7 @@ do_install_append_ibm-ac-server() { install -D ucd90160.yaml ${DEST}/ucd90160.yaml } -do_install_append_rainier() { +do_install_append_p10bmc() { DEST=${D}${datadir}/power-sequencer install -D ucd90160.yaml ${DEST}/ucd90160.yaml diff --git a/meta-ibm/recipes-phosphor/power/power-sequencer/p10bmc/ucd90160.yaml b/meta-ibm/recipes-phosphor/power/power-sequencer/p10bmc/ucd90160.yaml new file mode 100644 index 000000000..a6bba44ce --- /dev/null +++ b/meta-ibm/recipes-phosphor/power/power-sequencer/p10bmc/ucd90160.yaml @@ -0,0 +1,201 @@ +- Device: + index: 0 + # Linux sysfs path for this power sequencer (0x22 8-bit address) + path: /sys/bus/i2c/devices/i2c-8/8-0011 + RailNames: + - "12.0V" + - "5.0V_USB" + - "5.0V_DASD" + - "3.3VA" + - "3.3VB" + - "1.5V" + - "1.1V" + - "VDDA_DCM0" + - "VDDB_DCM0" + - "VDDA_DCM1" + - "VDDB_DCM1" + - "12.0VCS" + - "3.3VCS" + - "1.1V_Current" + - "5.0V_USB_Current" + - "5.0V_DASD_Current" + - "12.0VN" + - "12.0VP" + - "12.0VQ" + - "12.0VR" + - "ThermalDiode1" + - "ThermalDiode2" + - "ThermalDiode3" + - "ThermalDiode4" + GPIConfigs: + - name: PCIE_SLOT0 + gpi: 1 + pinID: 44 + poll: false + analysis: none + - name: PCIE_SLOT1 + gpi: 2 + pinID: 45 + poll: false + analysis: none + - name: PCIE_SLOT2 + gpi: 3 + pinID: 46 + poll: false + analysis: none + - name: PCIE_SLOT3 + gpi: 4 + pinID: 47 + poll: false + analysis: none + - name: PCIE_SLOT4 + gpi: 5 + pinID: 48 + poll: false + analysis: none + - name: PCIE_SLOT7 + gpi: 6 + pinID: 49 + poll: false + analysis: none + - name: PCIE_SLOT8 + gpi: 7 + pinID: 50 + poll: false + analysis: none + - name: PCIE_SLOT9 + gpi: 8 + pinID: 51 + poll: false + analysis: none + - name: PCIE_SLOT10 + gpi: 9 + pinID: 52 + poll: false + analysis: none + - name: PCIE_SLOT11 + gpi: 10 + pinID: 53 + poll: false + analysis: none + - name: SOFTWARE_PGOOD + gpi: 11 + pinID: 55 + poll: false + analysis: none + - name: PGOOD_12A + gpi: 12 + pinID: 56 + poll: false + analysis: none + - name: PGOOD_12B + gpi: 13 + pinID: 57 + poll: false + analysis: none + - name: PGOOD_12C + gpi: 14 + pinID: 58 + poll: false + analysis: none + - name: PGOOD_12D + gpi: 15 + pinID: 59 + poll: false + analysis: none + - name: PGOOD_12L + gpi: 16 + pinID: 60 + poll: false + analysis: none + - name: PGOOD_12M + gpi: 17 + pinID: 61 + poll: false + analysis: none + - name: PGOOD_12N + gpi: 18 + pinID: 62 + poll: false + analysis: none + - name: PGOOD_12P + gpi: 19 + pinID: 63 + poll: false + analysis: none + - name: PGOOD_12PCIE + gpi: 20 + pinID: 64 + poll: false + analysis: none + - name: PGOOD_12Q + gpi: 21 + pinID: 65 + poll: false + analysis: none + - name: PGOOD_12R + gpi: 22 + pinID: 66 + poll: false + analysis: none + - name: PGOOD_VDN_DCM0 + gpi: 23 + pinID: 72 + poll: false + analysis: none + - name: PGOOD_VDN_DCM1 + gpi: 24 + pinID: 73 + poll: false + analysis: none + - name: PGOOD_VCS_DCM0 + gpi: 25 + pinID: 74 + poll: false + analysis: none + - name: PGOOD_VCS_DCM1 + gpi: 26 + pinID: 75 + poll: false + analysis: none + - name: PGOOD_VIO_DCM0 + gpi: 27 + pinID: 76 + poll: false + analysis: none + - name: PGOOD_VIO_DCM1 + gpi: 28 + pinID: 77 + poll: false + analysis: none + - name: PGOOD_VPCIE_DCM0 + gpi: 29 + pinID: 78 + poll: false + analysis: none + - name: PGOOD_VPCIE_DCM1 + gpi: 30 + pinID: 79 + poll: false + analysis: none + - name: PGOOD_PSU1 + gpi: 31 + pinID: 80 + poll: false + analysis: none + - name: PGOOD_PSU2 + gpi: 32 + pinID: 81 + poll: false + analysis: none + - name: PGOOD_PSU3 + gpi: 33 + pinID: 82 + poll: false + analysis: none + - name: PGOOD_PSU4 + gpi: 34 + pinID: 83 + poll: false + analysis: none + diff --git a/meta-ibm/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml b/meta-ibm/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml deleted file mode 100644 index a6bba44ce..000000000 --- a/meta-ibm/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml +++ /dev/null @@ -1,201 +0,0 @@ -- Device: - index: 0 - # Linux sysfs path for this power sequencer (0x22 8-bit address) - path: /sys/bus/i2c/devices/i2c-8/8-0011 - RailNames: - - "12.0V" - - "5.0V_USB" - - "5.0V_DASD" - - "3.3VA" - - "3.3VB" - - "1.5V" - - "1.1V" - - "VDDA_DCM0" - - "VDDB_DCM0" - - "VDDA_DCM1" - - "VDDB_DCM1" - - "12.0VCS" - - "3.3VCS" - - "1.1V_Current" - - "5.0V_USB_Current" - - "5.0V_DASD_Current" - - "12.0VN" - - "12.0VP" - - "12.0VQ" - - "12.0VR" - - "ThermalDiode1" - - "ThermalDiode2" - - "ThermalDiode3" - - "ThermalDiode4" - GPIConfigs: - - name: PCIE_SLOT0 - gpi: 1 - pinID: 44 - poll: false - analysis: none - - name: PCIE_SLOT1 - gpi: 2 - pinID: 45 - poll: false - analysis: none - - name: PCIE_SLOT2 - gpi: 3 - pinID: 46 - poll: false - analysis: none - - name: PCIE_SLOT3 - gpi: 4 - pinID: 47 - poll: false - analysis: none - - name: PCIE_SLOT4 - gpi: 5 - pinID: 48 - poll: false - analysis: none - - name: PCIE_SLOT7 - gpi: 6 - pinID: 49 - poll: false - analysis: none - - name: PCIE_SLOT8 - gpi: 7 - pinID: 50 - poll: false - analysis: none - - name: PCIE_SLOT9 - gpi: 8 - pinID: 51 - poll: false - analysis: none - - name: PCIE_SLOT10 - gpi: 9 - pinID: 52 - poll: false - analysis: none - - name: PCIE_SLOT11 - gpi: 10 - pinID: 53 - poll: false - analysis: none - - name: SOFTWARE_PGOOD - gpi: 11 - pinID: 55 - poll: false - analysis: none - - name: PGOOD_12A - gpi: 12 - pinID: 56 - poll: false - analysis: none - - name: PGOOD_12B - gpi: 13 - pinID: 57 - poll: false - analysis: none - - name: PGOOD_12C - gpi: 14 - pinID: 58 - poll: false - analysis: none - - name: PGOOD_12D - gpi: 15 - pinID: 59 - poll: false - analysis: none - - name: PGOOD_12L - gpi: 16 - pinID: 60 - poll: false - analysis: none - - name: PGOOD_12M - gpi: 17 - pinID: 61 - poll: false - analysis: none - - name: PGOOD_12N - gpi: 18 - pinID: 62 - poll: false - analysis: none - - name: PGOOD_12P - gpi: 19 - pinID: 63 - poll: false - analysis: none - - name: PGOOD_12PCIE - gpi: 20 - pinID: 64 - poll: false - analysis: none - - name: PGOOD_12Q - gpi: 21 - pinID: 65 - poll: false - analysis: none - - name: PGOOD_12R - gpi: 22 - pinID: 66 - poll: false - analysis: none - - name: PGOOD_VDN_DCM0 - gpi: 23 - pinID: 72 - poll: false - analysis: none - - name: PGOOD_VDN_DCM1 - gpi: 24 - pinID: 73 - poll: false - analysis: none - - name: PGOOD_VCS_DCM0 - gpi: 25 - pinID: 74 - poll: false - analysis: none - - name: PGOOD_VCS_DCM1 - gpi: 26 - pinID: 75 - poll: false - analysis: none - - name: PGOOD_VIO_DCM0 - gpi: 27 - pinID: 76 - poll: false - analysis: none - - name: PGOOD_VIO_DCM1 - gpi: 28 - pinID: 77 - poll: false - analysis: none - - name: PGOOD_VPCIE_DCM0 - gpi: 29 - pinID: 78 - poll: false - analysis: none - - name: PGOOD_VPCIE_DCM1 - gpi: 30 - pinID: 79 - poll: false - analysis: none - - name: PGOOD_PSU1 - gpi: 31 - pinID: 80 - poll: false - analysis: none - - name: PGOOD_PSU2 - gpi: 32 - pinID: 81 - poll: false - analysis: none - - name: PGOOD_PSU3 - gpi: 33 - pinID: 82 - poll: false - analysis: none - - name: PGOOD_PSU4 - gpi: 34 - pinID: 83 - poll: false - analysis: none - -- cgit v1.2.3