From 62e0188468af0430cb06e1fb5a2daaaa21c9ae12 Mon Sep 17 00:00:00 2001 From: Matthew Barth Date: Mon, 15 Apr 2019 15:51:23 -0500 Subject: swift: Add max31785 device to hwmon for bring-up To support fan control for swift system bring-up, the max31785 device needs to be configured for hwmon to expose on dbus. Tested: All max31785 configs and service files exist in the image (From meta-ibm rev: 6dec46d2e34e1db46dff141f4495a4aa665af997) Change-Id: Ib7ebea8cc376f1fb3e2e340d56512440917f1420 Signed-off-by: Matthew Barth Signed-off-by: Brad Bishop --- .../recipes-phosphor/sensors/phosphor-hwmon_%.bbappend | 10 ++++++---- .../apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf | 17 +++++++++++++++++ .../apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf | 17 +++++++++++++++++ 3 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/swift-phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/swift-phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 067f2d08b..039450e3e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -8,11 +8,13 @@ SRC_URI += " \ file://start_max31785_hwmon.sh \ " -CHIPS_witherspoon = " \ +CHIPS = " \ + bus@1e78a000/i2c-bus@100/max31785@52_air \ + bus@1e78a000/i2c-bus@100/max31785@52_water \ + " +CHIPS_append_witherspoon = " \ bus@1e78a000/i2c-bus@100/bmp280@77 \ bus@1e78a000/i2c-bus@100/dps310@76 \ - bus@1e78a000/i2c-bus@100/max31785@52_air \ - bus@1e78a000/i2c-bus@100/max31785@52_water \ bus@1e78a000/i2c-bus@100/power-supply@68 \ bus@1e78a000/i2c-bus@100/power-supply@69 \ bus@1e78a000/i2c-bus@140/ir35221@70 \ @@ -23,7 +25,7 @@ CHIPS_witherspoon = " \ " ITEMSFMT = "ahb/apb/{0}.conf" -ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS_${MACHINE}')}" +ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}" OCCS_witherspoon = " \ 00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \ diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/swift-phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/swift-phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf new file mode 100644 index 000000000..cddafc1a2 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/swift-phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf @@ -0,0 +1,17 @@ +LABEL_fan1 = "fan0_0" +CRITLO_fan1 = "3000" +CRITHI_fan1 = "12000" + +LABEL_fan2 = "fan1_0" +CRITLO_fan2 = "3000" +CRITHI_fan2 = "12000" + +LABEL_fan3 = "fan2_0" +CRITLO_fan3 = "3000" +CRITHI_fan3 = "12000" + +LABEL_fan4 = "fan3_0" +CRITLO_fan4 = "3000" +CRITHI_fan4 = "12000" + +TARGET_MODE = "RPM" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/swift-phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/swift-phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf new file mode 100644 index 000000000..cddafc1a2 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/swift-phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf @@ -0,0 +1,17 @@ +LABEL_fan1 = "fan0_0" +CRITLO_fan1 = "3000" +CRITHI_fan1 = "12000" + +LABEL_fan2 = "fan1_0" +CRITLO_fan2 = "3000" +CRITHI_fan2 = "12000" + +LABEL_fan3 = "fan2_0" +CRITLO_fan3 = "3000" +CRITHI_fan3 = "12000" + +LABEL_fan4 = "fan3_0" +CRITLO_fan4 = "3000" +CRITHI_fan4 = "12000" + +TARGET_MODE = "RPM" -- cgit v1.2.3