Skip to content

Commit 918bbfd

Browse files
committed
meta-ibm:Use device path for p10bmc hwmon configs
With https://gerrit.openbmc.org/c/openbmc/phosphor-hwmon/+/72996, phosphor-hwmon can be told to use the device path as the path to the config file and not the OF_FULLNAME udev env var. Enable this option for the p10bmc image, and rename all of the config files in the image to be based on the device path. This is being done because the Rainier and Everest follow-ons, BlueRidge and Fuji, have a different name for the max31785 in the device tree, even though it shares the same fan card. With this change, the config files can be shared. This also deletes the Bonnell config file, because it is at the same device path as on Rainier but requires different contents. It will just be handled with something downstream. Tested: Things still show up on D-Bus: ``` $ busctl tree xyz.openbmc_project.Hwmon-75e29b8640dca44a8648ec8aeb240d520bd5eb91b19a8ebe4bbc48ef236d856c.Hwmon1 `- /xyz `- /xyz/openbmc_project `- /xyz/openbmc_project/sensors `- /xyz/openbmc_project/sensors/fan_tach |- /xyz/openbmc_project/sensors/fan_tach/fan0_0 |- /xyz/openbmc_project/sensors/fan_tach/fan0_1 |- /xyz/openbmc_project/sensors/fan_tach/fan1_0 |- /xyz/openbmc_project/sensors/fan_tach/fan1_1 |- /xyz/openbmc_project/sensors/fan_tach/fan2_0 |- /xyz/openbmc_project/sensors/fan_tach/fan2_1 |- /xyz/openbmc_project/sensors/fan_tach/fan3_0 |- /xyz/openbmc_project/sensors/fan_tach/fan3_1 |- /xyz/openbmc_project/sensors/fan_tach/fan4_0 |- /xyz/openbmc_project/sensors/fan_tach/fan4_1 |- /xyz/openbmc_project/sensors/fan_tach/fan5_0 `- /xyz/openbmc_project/sensors/fan_tach/fan5_1 ``` Change-Id: Ie413778b0383cc8115973337dd53d6aa06f45302 Signed-off-by: Matt Spinler <[email protected]>
1 parent 97d6351 commit 918bbfd

File tree

11 files changed

+11
-19
lines changed

11 files changed

+11
-19
lines changed

meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/[email protected]

-9
This file was deleted.

meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend

+11-10
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,19 @@ CHIPS:witherspoon-tacoma = " \
3131
"
3232

3333
CHIPS:p10bmc = " \
34-
bus@1e78a000/i2c-bus@200/power-supply@68 \
35-
bus@1e78a000/i2c-bus@200/power-supply@69 \
36-
bus@1e78a000/i2c-bus@200/power-supply@6a \
37-
bus@1e78a000/i2c-bus@200/power-supply@6d \
38-
bus@1e78a000/i2c-bus@200/power-supply@6b \
39-
bus@1e78a000/i2c-bus@200/power-supply@5a \
40-
bus@1e78a000/i2c-bus@200/power-supply@5b \
41-
bus@1e78a000/i2c-bus@400/max31785@52 \
42-
bus@1e78a000/i2c-bus@400/max31785b@52 \
43-
bus@1e78a000/i2c-bus@780/i2c-mux@70/i2c@3/max31785@52 \
34+
1e78a200.i2c-bus/i2c-3/3-0068 \
35+
1e78a200.i2c-bus/i2c-3/3-0069 \
36+
1e78a200.i2c-bus/i2c-3/3-006a \
37+
1e78a200.i2c-bus/i2c-3/3-006d \
38+
1e78a200.i2c-bus/i2c-3/3-006b \
39+
1e78a200.i2c-bus/i2c-3/3-005a \
40+
1e78a200.i2c-bus/i2c-3/3-005b \
41+
1e78a400.i2c-bus/i2c-7/7-0052 \
42+
1e78a780.i2c-bus/i2c-14/i2c-30/30-0052 \
4443
"
4544

4645
ITEMSFMT = "ahb/apb/{0}.conf"
46+
ITEMSFMT:p10bmc = "devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/{0}.conf"
4747
ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}"
4848

4949
OCCS = " \
@@ -63,3 +63,4 @@ PACKAGECONFIG:append:ibm-ac-server = " max31785-msl"
6363
SYSTEMD_ENVIRONMENT_FILE:max31785-msl:append:ibm-ac-server = " obmc/hwmon-max31785/max31785.conf"
6464
SYSTEMD_LINK:max31785-msl:append:ibm-ac-server = " ../[email protected]:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service"
6565

66+
PACKAGECONFIG:append:p10bmc = " use-dev-path"

0 commit comments

Comments
 (0)