summaryrefslogtreecommitdiff
path: root/meta-ibm
diff options
context:
space:
mode:
authorMatt Spinler <spinler@us.ibm.com>2019-04-25 23:19:21 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-04-26 16:38:59 +0300
commit6ffd2ac129913a082080c604e0f6513e15d96f0c (patch)
treec75b277428353d5b7b2b47dcad10c7222414962b /meta-ibm
parent8921e379eaf5d8fdd181689c3da7d162e71757c0 (diff)
downloadopenbmc-6ffd2ac129913a082080c604e0f6513e15d96f0c.tar.xz
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. (From meta-ibm rev: c4daa64b614ff35fcefcd6eabcc45f2ac3e54776) Signed-off-by: Matt Spinler <spinler@us.ibm.com> Change-Id: Ia89e9dbe32db84b265087b775716488da0d48b43 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-ibm')
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/swift/obmc/gpio/phosphor-power-supply-1.conf5
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon/obmc/gpio/phosphor-power-supply-1.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf)0
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend2
3 files changed, 6 insertions, 1 deletions
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/swift/obmc/gpio/phosphor-power-supply-1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/swift/obmc/gpio/phosphor-power-supply-1.conf
new file mode 100644
index 000000000..53a104531
--- /dev/null
+++ b/meta-ibm/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-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon/obmc/gpio/phosphor-power-supply-1.conf
index 56e16c567..56e16c567 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon/obmc/gpio/phosphor-power-supply-1.conf
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index 0fa11050b..bd39db50b 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-ibm/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"