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 <spinler@us.ibm.com>

11 files changed, 11 insertions, 19 deletions

diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785b@52.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785b@52.conf
deleted file mode 100644
index 5046f075d4..0000000000
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785b@52.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-LABEL_fan1 = "fan0_0"
-
-LABEL_fan2 = "fan1_0"
-
-LABEL_fan3 = "fan0_1"
-
-LABEL_fan4 = "fan1_1"
-
-TARGET_MODE = "RPM"
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@5a.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-005a.conf
index a07d5f75c0..a07d5f75c0 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@5a.conf
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-005a.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@5b.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-005b.conf
index 3850b525aa..3850b525aa 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@5b.conf
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-005b.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-0068.conf
index bac21768b5..bac21768b5 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-0068.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-0069.conf
index 161d7e7ced..161d7e7ced 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-0069.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@6a.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-006a.conf
index 148c527555..148c527555 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@6a.conf
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-006a.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@6b.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-006b.conf
index 19309dda9f..19309dda9f 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@6b.conf
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-006b.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@6d.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-006d.conf
index 148c527555..148c527555 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@6d.conf
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-006d.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785@52.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0052.conf
index c3b9db1468..c3b9db1468 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785@52.conf
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0052.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@780/i2c-mux@70/i2c@3/max31785@52.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a780.i2c-bus/i2c-14/i2c-30/30-0052.conf
index d3df21599d..d3df21599d 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@780/i2c-mux@70/i2c@3/max31785@52.conf
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a780.i2c-bus/i2c-14/i2c-30/30-0052.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index ebde5574f4..60b76d6945 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -31,19 +31,19 @@ CHIPS:witherspoon-tacoma = " \
                "
 
 CHIPS:p10bmc = " \
-               bus@1e78a000/i2c-bus@200/power-supply@68 \
-               bus@1e78a000/i2c-bus@200/power-supply@69 \
-               bus@1e78a000/i2c-bus@200/power-supply@6a \
-               bus@1e78a000/i2c-bus@200/power-supply@6d \
-               bus@1e78a000/i2c-bus@200/power-supply@6b \
-               bus@1e78a000/i2c-bus@200/power-supply@5a \
-               bus@1e78a000/i2c-bus@200/power-supply@5b \
-               bus@1e78a000/i2c-bus@400/max31785@52 \
-               bus@1e78a000/i2c-bus@400/max31785b@52 \
-               bus@1e78a000/i2c-bus@780/i2c-mux@70/i2c@3/max31785@52 \
+               1e78a200.i2c-bus/i2c-3/3-0068 \
+               1e78a200.i2c-bus/i2c-3/3-0069 \
+               1e78a200.i2c-bus/i2c-3/3-006a \
+               1e78a200.i2c-bus/i2c-3/3-006d \
+               1e78a200.i2c-bus/i2c-3/3-006b \
+               1e78a200.i2c-bus/i2c-3/3-005a \
+               1e78a200.i2c-bus/i2c-3/3-005b \
+               1e78a400.i2c-bus/i2c-7/7-0052 \
+               1e78a780.i2c-bus/i2c-14/i2c-30/30-0052 \
                "
 
 ITEMSFMT = "ahb/apb/{0}.conf"
+ITEMSFMT:p10bmc = "devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/{0}.conf"
 ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}"
 
 OCCS = " \
@@ -63,3 +63,4 @@ PACKAGECONFIG:append:ibm-ac-server = " max31785-msl"
 SYSTEMD_ENVIRONMENT_FILE:max31785-msl:append:ibm-ac-server = " obmc/hwmon-max31785/max31785.conf"
 SYSTEMD_LINK:max31785-msl:append:ibm-ac-server = " ../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service"
 
+PACKAGECONFIG:append:p10bmc = " use-dev-path"