From 8885ec2dc9d6db464a7b270574500ef751939f11 Mon Sep 17 00:00:00 2001 From: Brandon Wyman Date: Thu, 9 Nov 2017 19:29:58 -0600 Subject: Fix power supply presence information While testing missing power supply, the bottom power supply in the MRW is labeled as psu1, which would obviously map to powersupply1, but when that supply was removed and a power on attempted, the call out was for powerupply0. A simple rename of the labels does not work out right, due to the filenames, so swizzling the GPIO and I2C information. Resolves: openbmc/openbmc#2563 Change-Id: Iaed300becace2409e04c0097be9e2d7fa497dee3 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 +- .../ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@68.conf | 10 +++++----- .../ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@69.conf | 10 +++++----- 6 files changed, 16 insertions(+), 16 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 73de9bcef..f2ba6a3d8 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/powersupply0 DEVPATH=/dev/input/by-path/platform-gpio-keys-event -KEY=127 +KEY=104 NAME=powersupply0 -DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0068 +DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0069 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 facbd0850..98c4db3fd 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/powersupply1 DEVPATH=/dev/input/by-path/platform-gpio-keys-event -KEY=104 +KEY=127 NAME=powersupply1 -DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0069 +DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0068 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 1a8c7c921..d1b3af6f5 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 +DEVPATH=/sys/bus/i2c/devices/3-0069 INSTANCE=0 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 fe29da3be..11c8a6475 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 +DEVPATH=/sys/bus/i2c/devices/3-0068 INSTANCE=1 INVENTORY=/system/chassis/powersupply1 diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@68.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@68.conf index bf7e145e7..e463b517c 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@68.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@68.conf @@ -1,23 +1,23 @@ -LABEL_in1="ps0_input_voltage" +LABEL_in1="ps1_input_voltage" WARNHI_in1="290000" WARNLO_in1="200000" CRITHI_in1="300000" CRITLO_in1="180000" -LABEL_in2="ps0_output_voltage" +LABEL_in2="ps1_output_voltage" WARNHI_in2="12700" WARNLO_in2="0" CRITHI_in2="13000" CRITLO_in2="0" -LABEL_curr1="ps0_output_current" +LABEL_curr1="ps1_output_current" WARNHI_curr1="170000" WARNLO_curr1="0" CRITHI_curr1="180000" CRITLO_curr1="0" -LABEL_power1="ps0_input_power" +LABEL_power1="ps1_input_power" WARNHI_power1="2350000000" WARNLO_power1="0" CRITHI_power1="2500000000" -CRITLO_power1="0" \ No newline at end of file +CRITLO_power1="0" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@69.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@69.conf index c5e450e3d..2fadbdec0 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@69.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@69.conf @@ -1,23 +1,23 @@ -LABEL_in1="ps1_input_voltage" +LABEL_in1="ps0_input_voltage" WARNHI_in1="290000" WARNLO_in1="200000" CRITHI_in1="300000" CRITLO_in1="180000" -LABEL_in2="ps1_output_voltage" +LABEL_in2="ps0_output_voltage" WARNHI_in2="12700" WARNLO_in2="0" CRITHI_in2="13000" CRITLO_in2="0" -LABEL_curr1="ps1_output_current" +LABEL_curr1="ps0_output_current" WARNHI_curr1="170000" WARNLO_curr1="0" CRITHI_curr1="180000" CRITLO_curr1="0" -LABEL_power1="ps1_input_power" +LABEL_power1="ps0_input_power" WARNHI_power1="2350000000" WARNLO_power1="0" CRITHI_power1="2500000000" -CRITLO_power1="0" \ No newline at end of file +CRITLO_power1="0" -- cgit v1.2.1