meta-ibm: move all meta-witherspoon metadata

The metadata common to all IBM systems is confusingly split between
meta-ibm and meta-witherspoon.  Move everything to meta-ibm.

The meta-ibm README is re-written to more accurately reflect the scope
of the layer.

Allow the configuration samples (bblayers.conf.sample,
local.conf.sample) to be sourced from either meta-ibm or
meta-witherspoon until such a time that any workflows and tooling have
had the opportunity to move to meta-ibm.

(From meta-ibm rev: 6e05ef2e90b214eaf4e43ee7027bbbb1d8d09442)

Change-Id: I3ec890d5300f9649c974ea6b9dca93a2e8a889ab
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>

10 files changed, 138 insertions, 0 deletions

diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power/rainier/psu.json b/meta-ibm/recipes-phosphor/power/phosphor-power/rainier/psu.json
new file mode 100644
index 000000000..baa96ac27
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/power/phosphor-power/rainier/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/swift/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-ibm/recipes-phosphor/power/phosphor-power/swift/obmc/power-supply-monitor/power-supply-monitor-0.conf
new file mode 100644
index 000000000..167e605d0
--- /dev/null
+++ b/meta-ibm/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-ibm/recipes-phosphor/power/phosphor-power/swift/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-ibm/recipes-phosphor/power/phosphor-power/swift/obmc/power-supply-monitor/power-supply-monitor-1.conf
new file mode 100644
index 000000000..faa5adec6
--- /dev/null
+++ b/meta-ibm/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-ibm/recipes-phosphor/power/phosphor-power/swift/psu.json b/meta-ibm/recipes-phosphor/power/phosphor-power/swift/psu.json
new file mode 100644
index 000000000..94f14dd60
--- /dev/null
+++ b/meta-ibm/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-ibm/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-0.conf
new file mode 100644
index 000000000..15390ce42
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/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=38
diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-1.conf
new file mode 100644
index 000000000..ce9f322a5
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/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=38
diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/obmc/power-supply-monitor/power-supply-monitor-0.conf
new file mode 100644
index 000000000..d6732e6b8
--- /dev/null
+++ b/meta-ibm/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-ibm/recipes-phosphor/power/phosphor-power/witherspoon/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/obmc/power-supply-monitor/power-supply-monitor-1.conf
new file mode 100644
index 000000000..cace335b1
--- /dev/null
+++ b/meta-ibm/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-ibm/recipes-phosphor/power/phosphor-power/witherspoon/pseq-monitor-pgood.service b/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/pseq-monitor-pgood.service
new file mode 100644
index 000000000..458c5e6d7
--- /dev/null
+++ b/meta-ibm/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-ibm/recipes-phosphor/power/phosphor-power/witherspoon/psu.json b/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/psu.json
new file mode 100644
index 000000000..cbabc7839
--- /dev/null
+++ b/meta-ibm/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"
+  }
+}