From 5c933bada6bc2f8c1e34f2553206e26819cf26d9 Mon Sep 17 00:00:00 2001 From: Brandon Wyman Date: Thu, 2 Nov 2017 18:50:37 -0500 Subject: Change inventory string for power supplies Change the hardcoded power supply inventory paths to match the ones in the MRW, which are used by the LED manager. Change-Id: I1ba52286233e27b95c7296137aa135bbb4ef2d62 Signed-off-by: Brandon Wyman --- .../obmc/gpio/phosphor-power-supply-0.conf | 4 ++-- .../obmc/gpio/phosphor-power-supply-1.conf | 4 ++-- .../obmc/power-supply-monitor/power-supply-monitor-0.conf | 2 +- .../obmc/power-supply-monitor/power-supply-monitor-1.conf | 2 +- .../witherspoon-power-supply-monitor@.service | 4 ++-- .../witherspoon-power-supply-policy/power-supply-policy.yaml | 12 ++++++------ 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'meta-openbmc-machines/meta-openpower') diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf index 896679adf..73de9bcef 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf @@ -1,5 +1,5 @@ -INVENTORY=/system/chassis/power_supply0 +INVENTORY=/system/chassis/powersupply0 DEVPATH=/dev/input/by-path/platform-gpio-keys-event KEY=127 -NAME=power_supply0 +NAME=powersupply0 DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0068 diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf index 0f464956a..facbd0850 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf @@ -1,5 +1,5 @@ -INVENTORY=/system/chassis/power_supply1 +INVENTORY=/system/chassis/powersupply1 DEVPATH=/dev/input/by-path/platform-gpio-keys-event KEY=104 -NAME=power_supply1 +NAME=powersupply1 DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0069 diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf index a55828da4..1a8c7c921 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf @@ -1,4 +1,4 @@ DEVPATH=/sys/bus/i2c/devices/3-0068 INSTANCE=0 -INVENTORY=/system/chassis/power_supply0 +INVENTORY=/system/chassis/powersupply0 diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf index fea2ad0fd..fe29da3be 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf @@ -1,4 +1,4 @@ DEVPATH=/sys/bus/i2c/devices/3-0069 INSTANCE=1 -INVENTORY=/system/chassis/power_supply1 +INVENTORY=/system/chassis/powersupply1 diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service index 0e8f9d021..5de65df20 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service @@ -1,7 +1,7 @@ [Unit] Description=Witherspoon Power Supply %I Monitor -Wants=mapper-wait@-xyz-openbmc_project-inventory-system-chassis-power_supply%i.service -After=mapper-wait@-xyz-openbmc_project-inventory-system-chassis-power_supply%i.service +Wants=mapper-wait@-xyz-openbmc_project-inventory-system-chassis-powersupply%i.service +After=mapper-wait@-xyz-openbmc_project-inventory-system-chassis-powersupply%i.service Wants=mapper-wait@-org-openbmc-control-power0.service After=mapper-wait@-org-openbmc-control-power0.service ConditionPathExists={envfiledir}/obmc/power-supply-monitor/power-supply-monitor-%i.conf diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy/power-supply-policy.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy/power-supply-policy.yaml index 9d5740456..930901565 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy/power-supply-policy.yaml +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy/power-supply-policy.yaml @@ -7,14 +7,14 @@ group: path members: - meta: POWER SUPPLY - path: /xyz/openbmc_project/inventory/system/chassis/power_supply0 + path: /xyz/openbmc_project/inventory/system/chassis/powersupply0 - name: power supply1 class: group group: path members: - meta: POWER SUPPLY - path: /xyz/openbmc_project/inventory/system/chassis/power_supply1 + path: /xyz/openbmc_project/inventory/system/chassis/powersupply1 - name: power supplies description: > @@ -23,9 +23,9 @@ group: path members: - meta: POWER SUPPLY - path: /xyz/openbmc_project/inventory/system/chassis/power_supply0 + path: /xyz/openbmc_project/inventory/system/chassis/powersupply0 - meta: POWER SUPPLY - path: /xyz/openbmc_project/inventory/system/chassis/power_supply1 + path: /xyz/openbmc_project/inventory/system/chassis/powersupply1 - name: chassis state description: > @@ -142,7 +142,7 @@ error: xyz::openbmc_project::Inventory::Error::NotPresent metadata: - name: xyz::openbmc_project::Inventory::NotPresent::CALLOUT_INVENTORY_PATH - value: /xyz/openbmc_project/inventory/system/chassis/power_supply0 + value: /xyz/openbmc_project/inventory/system/chassis/powersupply0 type: string - name: notpresent power supply1 error @@ -153,5 +153,5 @@ error: xyz::openbmc_project::Inventory::Error::NotPresent metadata: - name: xyz::openbmc_project::Inventory::NotPresent::CALLOUT_INVENTORY_PATH - value: /xyz/openbmc_project/inventory/system/chassis/power_supply1 + value: /xyz/openbmc_project/inventory/system/chassis/powersupply1 type: string -- cgit v1.2.1