| commit | 082a2a3c7f546d188b949a47003b78aa12503d24 | [log] [tgz] |
|---|---|---|
| author | Matt Spinler <spinler@us.ibm.com> | Tue Sep 05 09:09:47 2017 -0500 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Tue Sep 12 16:39:28 2017 +0000 |
| tree | 4d083b56741fe805a6ac0f6b83af91fee9a057dd | |
| parent | c194219294ac479b5aa823295ea8a5d54b978448 [diff] |
Pass driver names to gpio-presence service New code in phosphor-gpio-presence has the ability to bind and unbind device drivers around card adds and removes if necessary. This commit passes in this driver information for the power supplies. Resolves openbmc/openbmc#2205 Change-Id: I7190219d549dc65cbb5498896b511a80a897aa8d Signed-off-by: Matt Spinler <spinler@us.ibm.com>
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf index b5d14d4..896679a 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf
@@ -2,3 +2,4 @@ DEVPATH=/dev/input/by-path/platform-gpio-keys-event KEY=127 NAME=power_supply0 +DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0068
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf index cac893b..0f46495 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf
@@ -2,3 +2,4 @@ DEVPATH=/dev/input/by-path/platform-gpio-keys-event KEY=104 NAME=power_supply1 +DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0069
diff --git a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service b/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service index 758a21f..df75824 100644 --- a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service +++ b/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service
@@ -6,7 +6,7 @@ [Service] EnvironmentFile={envfiledir}/obmc/gpio/phosphor-power-supply-%i.conf -ExecStart=/usr/bin/env phosphor-gpio-presence --path=${{DEVPATH}} --inventory=${{INVENTORY}} --key=${{KEY}} --name=${{NAME}} +ExecStart=/usr/bin/env phosphor-gpio-presence --path=${{DEVPATH}} --inventory=${{INVENTORY}} --key=${{KEY}} --name=${{NAME}} --drivers=${{DRIVERS}} SyslogIdentifier=phosphor-gpio-presence [Install]