summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLei YU <mine260309@gmail.com>2017-11-24 15:36:06 +0800
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-01-05 16:10:57 +0000
commit71e13bc4e698dd0e0f03c41b45e8c5c0744e61be (patch)
tree519c035975ecc92ab947af7582f30379a8cec71e
parenteaab742def0c679ec4e1f61a344aa9ec384d98d5 (diff)
downloadtalos-openbmc-71e13bc4e698dd0e0f03c41b45e8c5c0744e61be.tar.gz
talos-openbmc-71e13bc4e698dd0e0f03c41b45e8c5c0744e61be.zip
meta-romulus: Add fan tacho hwmon sensor config
Change-Id: I8d1540c7f44d268154a9ff415177e4f40e31b108 Signed-off-by: Lei YU <mine260309@gmail.com>
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon%.bbappend8
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf4
2 files changed, 12 insertions, 0 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
index bbd977fe2..ebe0a53fb 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
@@ -7,6 +7,13 @@ SRCREV = "26d21731c292a02ec71480fade9a06658160eafb"
SRC_URI += " file://0001-sysfs-Return-ETIMEDOUT-instead-of-throw-exception.patch"
+CHIPS = " \
+ pwm-tacho-controller@1e786000 \
+ "
+ITEMSFMT = "ahb/apb/{0}.conf"
+
+ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}"
+
OCCS = " \
sbefifo@2400/occ@1/occ-hwmon@1 \
hub@3400/cfam@1,0/sbefifo@2400/occ@2/occ-hwmon@2 \
@@ -16,4 +23,5 @@ OCCSFMT = "gpio-fsi/cfam@0,0/{0}.conf"
OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}"
ENVS = "obmc/hwmon/{0}"
+SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}"
SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'OCCITEMS')}"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf
new file mode 100644
index 000000000..6f90415b8
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf
@@ -0,0 +1,4 @@
+# Romulus has 7 fan ports but only 3 are used
+LABEL_fan9 = "fan0"
+LABEL_fan11 = "fan1"
+LABEL_fan13 = "fan2"
OpenPOWER on IntegriCloud