| commit | c4daa64b614ff35fcefcd6eabcc45f2ac3e54776 | [log] [tgz] |
|---|---|---|
| author | Matt Spinler <spinler@us.ibm.com> | Thu Apr 25 15:19:21 2019 -0500 |
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Fri Apr 26 13:36:25 2019 +0000 |
| tree | 4cf404a8fe5446037a6ce5a7f068c2282ef7f0ee | |
| parent | 2eb5a13421e2c5e5bc0a0cfac9de87f0cd8c9c59 [diff] |
Swift power supply presence detects
PS0 uses the same GPIO that witherspoon uses, but PS1
uses GPIOR7 (143).
Tested: Built both images, made sure the correct conf files
showed up in rootfs.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: Id12161a921e68ce44a2a74181b4eeda1ff41d916
diff --git a/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/swift/obmc/gpio/phosphor-power-supply-1.conf b/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/swift/obmc/gpio/phosphor-power-supply-1.conf new file mode 100644 index 0000000..53a1045 --- /dev/null +++ b/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/swift/obmc/gpio/phosphor-power-supply-1.conf
@@ -0,0 +1,5 @@ +INVENTORY=/system/chassis/motherboard/powersupply1 +DEVPATH=/dev/input/by-path/platform-gpio-keys-event +KEY=143 +NAME=powersupply1 +DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0068
diff --git a/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf b/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon/obmc/gpio/phosphor-power-supply-1.conf similarity index 100% rename from meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf rename to meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon/obmc/gpio/phosphor-power-supply-1.conf
diff --git a/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 0fa1105..bd39db5 100644 --- a/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -1,4 +1,4 @@ -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:${THISDIR}/${PN}/${MACHINE}:" TMPL_POWERSUPPLY = "phosphor-gpio-presence@.service" INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service"