meta-witherspoon: Use phosphor-power recipe
phosphor-power recipe is added in meta-phosphor, replace
witherspoon-pfault-analysis with phosphor-power.
Add "psuDevices" in psu.json for witherspoon and swift.
Tested: Verify witherspoon build is OK, the phosphor-power related
binaries and the services are installed correctly.
Change-Id: I561dc421167cbd2018df8a86c046545c7c86fa0a
Signed-off-by: Lei YU <mine260309@gmail.com>
diff --git a/meta-witherspoon/recipes-phosphor/power/phosphor-power/swift/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-witherspoon/recipes-phosphor/power/phosphor-power/swift/obmc/power-supply-monitor/power-supply-monitor-0.conf
new file mode 100644
index 0000000..167e605
--- /dev/null
+++ b/meta-witherspoon/recipes-phosphor/power/phosphor-power/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-witherspoon/recipes-phosphor/power/phosphor-power/swift/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-witherspoon/recipes-phosphor/power/phosphor-power/swift/obmc/power-supply-monitor/power-supply-monitor-1.conf
new file mode 100644
index 0000000..faa5ade
--- /dev/null
+++ b/meta-witherspoon/recipes-phosphor/power/phosphor-power/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-witherspoon/recipes-phosphor/power/phosphor-power/swift/psu.json b/meta-witherspoon/recipes-phosphor/power/phosphor-power/swift/psu.json
new file mode 100644
index 0000000..94f14dd
--- /dev/null
+++ b/meta-witherspoon/recipes-phosphor/power/phosphor-power/swift/psu.json
@@ -0,0 +1,29 @@
+{
+ "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"
+ }
+}
diff --git a/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/obmc/power-supply-monitor/power-supply-monitor-0.conf
new file mode 100644
index 0000000..d6732e6
--- /dev/null
+++ b/meta-witherspoon/recipes-phosphor/power/phosphor-power/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-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/obmc/power-supply-monitor/power-supply-monitor-1.conf
new file mode 100644
index 0000000..cace335
--- /dev/null
+++ b/meta-witherspoon/recipes-phosphor/power/phosphor-power/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
diff --git a/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/pseq-monitor-pgood.service b/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/pseq-monitor-pgood.service
new file mode 100644
index 0000000..458c5e6
--- /dev/null
+++ b/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/pseq-monitor-pgood.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Power Sequencer Power-on Monitor
+Wants=op-power-start@0.service
+After=op-power-start@0.service
+Wants=power-workarounds@0.service
+After=power-workarounds@0.service
+Conflicts=obmc-chassis-poweroff@0.target
+ConditionPathExists=!/run/openbmc/chassis@0-on
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/env pseq-monitor -a pgood-monitor -i 5000
+SyslogIdentifier=pseq-monitor
diff --git a/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/psu.json b/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/psu.json
new file mode 100644
index 0000000..cbabc78
--- /dev/null
+++ b/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/psu.json
@@ -0,0 +1,29 @@
+{
+ "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-0069",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1" : "/sys/bus/i2c/devices/3-0068"
+ }
+}