From f1d637dc1cbfb7706e9ce511a89aded5ea3fdb26 Mon Sep 17 00:00:00 2001 From: Matt Spinler Date: Tue, 11 Jun 2019 16:26:22 -0500 Subject: Different PS I2C addresses for wspoon vs swift Since the power supply I2C addresses are swapped between the 2 systems, there needs to be separate config files. (From meta-ibm rev: 7b91758259c860052d5f292a86a56c0d18884616) Signed-off-by: Matt Spinler Change-Id: I3eb8ec881a7e4d7887c79a53ef142ee2f948b53f Signed-off-by: Brad Bishop --- .../obmc/power-supply-monitor/power-supply-monitor-0.conf | 6 ------ .../obmc/power-supply-monitor/power-supply-monitor-1.conf | 6 ------ .../swift/obmc/power-supply-monitor/power-supply-monitor-0.conf | 6 ++++++ .../swift/obmc/power-supply-monitor/power-supply-monitor-1.conf | 6 ++++++ .../obmc/power-supply-monitor/power-supply-monitor-0.conf | 6 ++++++ .../obmc/power-supply-monitor/power-supply-monitor-1.conf | 6 ++++++ 6 files changed, 24 insertions(+), 12 deletions(-) delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/swift/obmc/power-supply-monitor/power-supply-monitor-0.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/swift/obmc/power-supply-monitor/power-supply-monitor-1.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon/obmc/power-supply-monitor/power-supply-monitor-0.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon/obmc/power-supply-monitor/power-supply-monitor-1.conf (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf deleted file mode 100644 index 167e605d0d..0000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf +++ /dev/null @@ -1,6 +0,0 @@ -DEVPATH=/sys/bus/i2c/devices/3-0068 -INSTANCE=0 -INVENTORY=/system/chassis/motherboard/powersupply0 -NUM_HISTORY_RECORDS=120 -SYNC_GPIO_PATH=/dev/gpiochip0 -SYNC_GPIO_NUM=105 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf deleted file mode 100644 index faa5adec6d..0000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf +++ /dev/null @@ -1,6 +0,0 @@ -DEVPATH=/sys/bus/i2c/devices/3-0069 -INSTANCE=1 -INVENTORY=/system/chassis/motherboard/powersupply1 -NUM_HISTORY_RECORDS=120 -SYNC_GPIO_PATH=/dev/gpiochip0 -SYNC_GPIO_NUM=105 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/swift/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/swift/obmc/power-supply-monitor/power-supply-monitor-0.conf new file mode 100644 index 0000000000..167e605d0d --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/swift/obmc/power-supply-monitor/power-supply-monitor-0.conf @@ -0,0 +1,6 @@ +DEVPATH=/sys/bus/i2c/devices/3-0068 +INSTANCE=0 +INVENTORY=/system/chassis/motherboard/powersupply0 +NUM_HISTORY_RECORDS=120 +SYNC_GPIO_PATH=/dev/gpiochip0 +SYNC_GPIO_NUM=105 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/swift/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/swift/obmc/power-supply-monitor/power-supply-monitor-1.conf new file mode 100644 index 0000000000..faa5adec6d --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/swift/obmc/power-supply-monitor/power-supply-monitor-1.conf @@ -0,0 +1,6 @@ +DEVPATH=/sys/bus/i2c/devices/3-0069 +INSTANCE=1 +INVENTORY=/system/chassis/motherboard/powersupply1 +NUM_HISTORY_RECORDS=120 +SYNC_GPIO_PATH=/dev/gpiochip0 +SYNC_GPIO_NUM=105 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon/obmc/power-supply-monitor/power-supply-monitor-0.conf new file mode 100644 index 0000000000..d6732e6b8a --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon/obmc/power-supply-monitor/power-supply-monitor-0.conf @@ -0,0 +1,6 @@ +DEVPATH=/sys/bus/i2c/devices/3-0069 +INSTANCE=0 +INVENTORY=/system/chassis/motherboard/powersupply0 +NUM_HISTORY_RECORDS=120 +SYNC_GPIO_PATH=/dev/gpiochip0 +SYNC_GPIO_NUM=105 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon/obmc/power-supply-monitor/power-supply-monitor-1.conf new file mode 100644 index 0000000000..cace335b16 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon/obmc/power-supply-monitor/power-supply-monitor-1.conf @@ -0,0 +1,6 @@ +DEVPATH=/sys/bus/i2c/devices/3-0068 +INSTANCE=1 +INVENTORY=/system/chassis/motherboard/powersupply1 +NUM_HISTORY_RECORDS=120 +SYNC_GPIO_PATH=/dev/gpiochip0 +SYNC_GPIO_NUM=105 -- cgit v1.2.3