linux-aspeed: Rename APB nodes, PT5161L support, Catalina updates The notable change is to the phosphor-hwmon configuration paths for all Aspeed-based platforms. The changes were generated with the following incantations: ``` git ls-files -- :/:*/ahb/apb/bus@1e78* | while read -r S; do D="$(echo $S | sed -E 's|ahb/apb/bus@1e78a000/i2c-bus|ahb/apb@1e780000/bus@1e78a000/i2c|')"; mkdir -p "$(dirname "$D")"; git mv "$S" "$D"; done git ls-files -- :/:*/ahb/apb/pwm-tacho-controller@1e786* | while read -r S; do D="$(echo "$S" | sed -E 's|ahb/apb/pwm-tacho-controller@1e786000|ahb/apb@1e780000/pwm-tacho-controller@1e786000|')"; mkdir -p "$(dirname "$D")"; git mv "$S" "$D"; done sed -Ei 's|ahb/apb/|ahb/apb@1e780000/|g' meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend sed -Ei 's/i2c-bus@/i2c@/g' meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend meta-ibm/meta-romulus/recipes-phosphor/logging/files/callouts.yaml meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend meta-ibm/recipes-phosphor/chassis/vrm-control/ibm-ac-server/ir35221-unbind-bind.sh meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/swift/config.yaml meta-ibm/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend sed -Ei 's|/ahb:apb/|/1e780000.apb/|g' $(git grep -lE 'ahb:apb/.*1e78') sed -Ei 's|ahb:apb:i2c@1e78a000|1e780000.apb:bus@1e78a000|g' $(git grep -l ahb:apb:i2c@1e78a000) sed -Ei 's|ahb:apb|1e6e0000.apb|g' meta-phosphor/recipes-phosphor/video/uart-render-controller/uart-render-controller.service git ls-files -- :/:meta-ibm/*/ahb--apb/* | while read -r S; do D="$(echo "$S" | sed -E 's/ahb--apb/1e780000.apb/g')"; mkdir -p "$(dirname "$D")"; git mv "$S" "$D"; done; sed -Ei 's/ahb--apb/1e780000.apb/g' $(git grep -l ahb--apb -- meta-ibm) git ls-files -- :/:*i2c-bus* | while read -r S; do D="$(echo "$S" | sed -E 's/(1e78a..0).i2c-bus/\1.i2c/g')"; mkdir -p "$(dirname "$D")"; git mv "$S" "$D"; done; sed -Ei 's/(1e78a..0).i2c-bus/\1.i2c/g' $(git grep -lE '(1e78a..0).i2c-bus') ``` What couldn't be automated was cleaning up the ibm-logging policy table, which had many duplicate keys that needed manual inspection to remove. It's worth noting that even for the remaining, non-duplicate keys, the sysfs paths are not correct: The physical address of the I2C controllers needs to map to the assigned device index, but in the file they all have address 1e78a100 despite changes to the device index. From eslint in CI: ``` meta-ibm/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json 9999:10 error Duplicate object key json/* 10020:10 error Duplicate object key json/* 10041:10 error Duplicate object key json/* 10062:10 error Duplicate object key json/* 10083:10 error Duplicate object key json/* 10104:10 error Duplicate object key json/* 17097:10 error Duplicate object key json/* 17118:10 error Duplicate object key json/* 17139:10 error Duplicate object key json/* 17160:10 error Duplicate object key json/* 17181:10 error Duplicate object key json/* 17202:10 error Duplicate object key json/* 17223:10 error Duplicate object key json/* 17244:10 error Duplicate object key json/* 17265:10 error Duplicate object key json/* 17286:10 error Duplicate object key json/* 17307:10 error Duplicate object key json/* 17328:10 error Duplicate object key json/* 17349:10 error Duplicate object key json/* 17370:10 error Duplicate object key json/* 17391:10 error Duplicate object key json/* 17412:10 error Duplicate object key json/* 17433:10 error Duplicate object key json/* 17454:10 error Duplicate object key json/* 19575:10 error Duplicate object key json/* 19596:10 error Duplicate object key json/* ``` Andrew Jeffery (1): ARM: dts: aspeed: Rework APB nodes Cosmo Chou (3): dt-bindings: vendor-prefixes: add asteralabs dt-bindings: trivial-devices: add Astera Labs PT5161L hwmon: Add driver for Astera Labs PT5161L retimer Potin Lai (2): ARM: dts: aspeed: catalina: add pdb cpld io expander ARM: dts: aspeed: catalina: update io_expander7 & io_expander8 line name Rob Herring (Arm) (1): arm: dts: aspeed: Use standard 'i2c' bus node name Change-Id: I32ca7579eabd59ed20da3f481da687589a361763 Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>

commit: a221e432b030563430d1c1b32a6ebc010d3ba505 [log] [tgz]
author: Andrew Jeffery <andrew@codeconstruct.com.au> Mon Aug 26 11:45:10 2024 +0930
committer: Patrick Williams <patrick@stwcx.xyz> Tue Sep 03 14:17:35 2024 +0000
tree: 8516ec3693075083ac0f5721f93e8dadb82317a5
parent: 4e752813c500459eb596f6791240a1e1a082b7c7 [diff]
diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
index 9c7fc4b..d2e47e5 100644
--- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
+++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb

@@ -1,6 +1,6 @@
 KBRANCH ?= "dev-6.6"
 LINUX_VERSION ?= "6.6.47"
 
-SRCREV="1760371b277718062211fc7eb6f3042c5051c1a5"
+SRCREV="742fa644242fea6ed202b18b2f3dd6cb437d33cf"
 
 require linux-aspeed.inc

diff --git a/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/setup-uart-routing b/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/setup-uart-routing
index 9df066b..ecf3cdf 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/setup-uart-routing
+++ b/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/setup-uart-routing

@@ -1,8 +1,8 @@
 #!/bin/bash
 
 connect_uart_route() {
-  echo -ne "$1" > /sys/devices/platform/ahb/ahb:apb/1e789000.lpc/1e789098.uart-routing/"$2"
-  echo -ne "$2" > /sys/devices/platform/ahb/ahb:apb/1e789000.lpc/1e789098.uart-routing/"$1"
+  echo -ne "$1" > /sys/devices/platform/ahb/1e780000.apb/1e789000.lpc/1e789098.uart-routing/"$2"
+  echo -ne "$2" > /sys/devices/platform/ahb/1e780000.apb/1e789000.lpc/1e789098.uart-routing/"$1"
 }
 
 connect_uart_route "uart1" "uart4"

diff --git a/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend
index 864cf0e..8383e30 100644
--- a/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend
+++ b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend

@@ -25,14 +25,14 @@
 
 do_install:append:witherspoon() {
         DEST=${D}${inventory_envdir}
-        printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-11/11-0051/eeprom" >> ${DEST}/inventory
+        printf "\nEEPROM=/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a400.i2c/i2c-11/11-0051/eeprom" >> ${DEST}/inventory
 }
 
 do_install:append:witherspoon-tacoma() {
         DEST=${D}${inventory_envdir}
         printf "FRUS=BMC,ETHERNET" > ${DEST}/inventory
         printf "\nPATHS=/system/chassis/motherboard/bmc,/system/chassis/motherboard/bmc/eth0" >> ${DEST}/inventory
-        printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a600.i2c-bus/i2c-11/11-0051/eeprom" >> ${DEST}/inventory
+        printf "\nEEPROM=/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a600.i2c/i2c-11/11-0051/eeprom" >> ${DEST}/inventory
 }
 
 pkg_postinst:${PN}:p10bmc() {

diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/occ-hwmon@50.conf b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/occ-hwmon@50.conf
similarity index 100%
rename from meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/occ-hwmon@50.conf
rename to meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/occ-hwmon@50.conf


diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/rtc@68.conf b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@40/rtc@68.conf
similarity index 100%
rename from meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/rtc@68.conf
rename to meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@40/rtc@68.conf


diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/tmp423@4c.conf b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@c0/tmp423@4c.conf
similarity index 100%
rename from meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/tmp423@4c.conf
rename to meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@c0/tmp423@4c.conf


diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 573c0b8..561da51 100644
--- a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend

@@ -1,11 +1,11 @@
 FILESEXTRAPATHS:prepend:palmetto := "${THISDIR}/${PN}:"
 
 NAMES = " \
-        bus@1e78a000/i2c-bus@40/rtc@68 \
-        bus@1e78a000/i2c-bus@c0/tmp423@4c \
-        bus@1e78a000/i2c-bus@100/occ-hwmon@50 \
+        bus@1e78a000/i2c@40/rtc@68 \
+        bus@1e78a000/i2c@c0/tmp423@4c \
+        bus@1e78a000/i2c@100/occ-hwmon@50 \
         "
-ITEMSFMT = "ahb/apb/{0}.conf"
+ITEMSFMT = "ahb/apb@1e780000/{0}.conf"
 
 ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAMES')}"
 

diff --git a/meta-ibm/meta-romulus/recipes-phosphor/logging/files/callouts.yaml b/meta-ibm/meta-romulus/recipes-phosphor/logging/files/callouts.yaml
index 02bb3d8..156d1e5 100644
--- a/meta-ibm/meta-romulus/recipes-phosphor/logging/files/callouts.yaml
+++ b/meta-ibm/meta-romulus/recipes-phosphor/logging/files/callouts.yaml

@@ -1,5 +1,5 @@
 # TODO: Add i2c devices like
-# /sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0052: /system/chassis/motherboard
+# /sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0052: /system/chassis/motherboard
 /sys/devices/platform/gpio-fsi/fsi0/slave@00:00/raw: /system/chassis/motherboard/cpu0
 /sys/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:0a/fsi1/slave@01:00/raw: /system/chassis/motherboard/cpu1
 

diff --git a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@440/w83773g@4c.conf
similarity index 100%
rename from meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf
rename to meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@440/w83773g@4c.conf


diff --git a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/pwm-tacho-controller@1e786000.conf
similarity index 100%
rename from meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf
rename to meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/pwm-tacho-controller@1e786000.conf


diff --git a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 703cac2..67e0350 100644
--- a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend

@@ -3,10 +3,10 @@
 EXTRA_OEMESON:append:romulus = " -Dnegative-errno-on-fail=true"
 
 CHIPS = " \
-        bus@1e78a000/i2c-bus@440/w83773g@4c \
+        bus@1e78a000/i2c@440/w83773g@4c \
         pwm-tacho-controller@1e786000 \
         "
-ITEMSFMT = "ahb/apb/{0}.conf"
+ITEMSFMT = "ahb/apb@1e780000/{0}.conf"
 
 ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}"
 

diff --git a/meta-ibm/recipes-phosphor/chassis/vrm-control/ibm-ac-server/ir35221-unbind-bind.sh b/meta-ibm/recipes-phosphor/chassis/vrm-control/ibm-ac-server/ir35221-unbind-bind.sh
index c35a61b..e34d218 100644
--- a/meta-ibm/recipes-phosphor/chassis/vrm-control/ibm-ac-server/ir35221-unbind-bind.sh
+++ b/meta-ibm/recipes-phosphor/chassis/vrm-control/ibm-ac-server/ir35221-unbind-bind.sh

@@ -6,7 +6,7 @@
 status=0
 max_retries=3
 driver_path="/sys/bus/i2c/drivers/ir35221/"
-platform_path="/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/"
+platform_path="/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/"
 
 unbind_driver () {
     echo "$1" > $driver_path/unbind
@@ -58,22 +58,22 @@
     fi
 elif [ "$1" = "bind" ]
 then
-    if [ -e $platform_path/1e78a140.i2c-bus/i2c-4/4-0070 ]
+    if [ -e $platform_path/1e78a140.i2c/i2c-4/4-0070 ]
     then
         bind_driver "4-0070"
     fi
 
-    if [ -e $platform_path/1e78a140.i2c-bus/i2c-4/4-0071 ]
+    if [ -e $platform_path/1e78a140.i2c/i2c-4/4-0071 ]
     then
         bind_driver "4-0071"
     fi
 
-    if [ -e $platform_path/1e78a180.i2c-bus/i2c-5/5-0070 ]
+    if [ -e $platform_path/1e78a180.i2c/i2c-5/5-0070 ]
     then
         bind_driver "5-0070"
     fi
 
-    if [ -e $platform_path/1e78a180.i2c-bus/i2c-5/5-0071 ]
+    if [ -e $platform_path/1e78a180.i2c/i2c-5/5-0071 ]
     then
         bind_driver "5-0071"
     fi

diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/swift/config.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/swift/config.yaml
index 20dc31c..adcb892 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/swift/config.yaml
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/swift/config.yaml

@@ -3,7 +3,7 @@
   methods:
     - type: gpio
       key: 5
-      physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060
+      physpath: /sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0060
       devpath: /dev/input/by-path/platform-gpio-keys-polled-event
     - type: tach
       sensors:
@@ -16,7 +16,7 @@
   methods:
     - type: gpio
       key: 6
-      physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060
+      physpath: /sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0060
       devpath: /dev/input/by-path/platform-gpio-keys-polled-event
     - type: tach
       sensors:
@@ -29,7 +29,7 @@
   methods:
     - type: gpio
       key: 7
-      physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060
+      physpath: /sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0060
       devpath: /dev/input/by-path/platform-gpio-keys-polled-event
     - type: tach
       sensors:
@@ -42,7 +42,7 @@
   methods:
     - type: gpio
       key: 8
-      physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060
+      physpath: /sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0060
       devpath: /dev/input/by-path/platform-gpio-keys-polled-event
     - type: tach
       sensors:
@@ -56,7 +56,7 @@
   methods:
     - type: gpio
       key: 9
-      physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060
+      physpath: /sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0060
       devpath: /dev/input/by-path/platform-gpio-keys-polled-event
   rpolicy:
     type: anyof

diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json b/meta-ibm/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json
index 123aa6d..5da4886 100644
--- a/meta-ibm/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json
+++ b/meta-ibm/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json

@@ -9996,7 +9996,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-11/11-0064": {
+        "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-11/11-0064": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure",
@@ -10017,7 +10017,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0068": {
+        "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0068": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure",
@@ -10038,70 +10038,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0069": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0060F",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from power supply 0",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-11/11-0064": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0059F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from the power sequencer chip on the system backplane",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0068": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0060F",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from power supply 1",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0069": {
+        "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0069": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure",
@@ -17094,7 +17031,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0052": {
+        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0052": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
@@ -17115,7 +17052,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0068": {
+        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0068": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
@@ -17136,7 +17073,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0069": {
+        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0069": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
@@ -17157,7 +17094,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0076": {
+        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0076": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
@@ -17178,7 +17115,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0077": {
+        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0077": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
@@ -17199,7 +17136,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-4/4-0070": {
+        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-4/4-0070": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
@@ -17220,7 +17157,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-4/4-0071": {
+        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-4/4-0071": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
@@ -17241,7 +17178,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-5/5-0070": {
+        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-5/5-0070": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
@@ -17262,196 +17199,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-9/9-004a": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0056F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from the PCIE temperature sensor on the system backplane",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0052": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0057F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from the fan control device on the system backplane",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0068": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0060F",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from power supply 1",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0069": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0060F",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from power supply 0",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0076": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0053F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from the ambient temperature sensor on the system backplane",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0077": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0052F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from the ambient temperature sensor on the system backplane",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-4/4-0070": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0054F",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from the CPU 0 VDD/VCS VRM on the system backplane",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-4/4-0071": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0055F",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from the CPU 1 VDN/VDDR VRM on the system backplane",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-5/5-0070": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0054F",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from the CPU 1 VDD/VCS VRM on the system backplane",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-9/9-004a": {
+        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-9/9-004a": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
@@ -19572,28 +19320,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Sensor.Device.Error.WriteFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0052": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.WriteFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0058F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to write to the fan control device on the system backplane",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.WriteFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0052": {
+        "xyz.openbmc_project.Sensor.Device.Error.WriteFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0052": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.WriteFailure",

diff --git a/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 b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-005a.conf
similarity index 100%
rename from 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
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-005a.conf


diff --git a/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 b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-005b.conf
similarity index 100%
rename from 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
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-005b.conf


diff --git a/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 b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-0068.conf
similarity index 100%
rename from 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
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-0068.conf


diff --git a/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 b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-0069.conf
similarity index 100%
rename from 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
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-0069.conf


diff --git a/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 b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-006a.conf
similarity index 100%
rename from 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
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-006a.conf


diff --git a/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 b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-006b.conf
similarity index 100%
rename from 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
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-006b.conf


diff --git a/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 b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-006d.conf
similarity index 100%
rename from 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
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-006d.conf


diff --git a/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 b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a400.i2c/i2c-7/7-0052.conf
similarity index 100%
rename from 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
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a400.i2c/i2c-7/7-0052.conf


diff --git a/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 b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a780.i2c/i2c-14/i2c-30/30-0052.conf
similarity index 100%
rename from 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
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a780.i2c/i2c-14/i2c-30/30-0052.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/max31785@52.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/max31785@52.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/power-supply@68.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/power-supply@68.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/power-supply@69.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/power-supply@69.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/dps310@76.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/dps310@76.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/dps310@76.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/dps310@76.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/si7021a20@20.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/si7021a20@20.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/si7021a20@20.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/si7021a20@20.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/tmp275@48.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/tmp275@48.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/tmp275@48.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/tmp275@48.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35219@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@380/ir35219@70.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35219@70.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@380/ir35219@70.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@71.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@380/ir35221@71.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@71.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@380/ir35221@71.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@72.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@380/ir35221@72.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@72.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@380/ir35221@72.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35219@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@3c0/ir35219@70.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35219@70.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@3c0/ir35219@70.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@71.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@3c0/ir35221@71.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@71.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@3c0/ir35221@71.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@72.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@3c0/ir35221@72.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@72.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@3c0/ir35221@72.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@48.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@440/tmp275@48.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@48.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@440/tmp275@48.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@4a.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@440/tmp275@4a.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@4a.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@440/tmp275@4a.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/bmp280@77.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/bmp280@77.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/dps310@76.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/dps310@76.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/max31785@52.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/max31785@52.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/power-supply@68.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/power-supply@68.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/power-supply@69.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/power-supply@69.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@280/ir35221@70.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@280/ir35221@70.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@280/ir35221@71.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@280/ir35221@71.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/ir35221@70.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/ir35221@70.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/ir35221@71.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/ir35221@71.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@500/tmp275@4a.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@500/tmp275@4a.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/bmp280@77.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/bmp280@77.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/bmp280@77.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/bmp280@77.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/dps310@76.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/dps310@76.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/dps310@76.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/dps310@76.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/max31785@52.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/max31785@52.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/power-supply@68.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/power-supply@68.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/power-supply@69.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/power-supply@69.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@140/ir35221@70.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@140/ir35221@70.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@140/ir35221@71.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@140/ir35221@71.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/ir35221@70.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/ir35221@70.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/ir35221@71.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/ir35221@71.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/tmp275@4a.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@380/tmp275@4a.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/tmp275@4a.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@380/tmp275@4a.conf


diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 60b76d6..f86367a 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend

@@ -5,45 +5,45 @@
            "
 
 CHIPS:witherspoon = " \
-               bus@1e78a000/i2c-bus@100/max31785@52 \
-               bus@1e78a000/i2c-bus@100/power-supply@68 \
-               bus@1e78a000/i2c-bus@100/power-supply@69 \
-               bus@1e78a000/i2c-bus@100/bmp280@77 \
-               bus@1e78a000/i2c-bus@100/dps310@76 \
-               bus@1e78a000/i2c-bus@140/ir35221@70 \
-               bus@1e78a000/i2c-bus@140/ir35221@71 \
-               bus@1e78a000/i2c-bus@180/ir35221@70 \
-               bus@1e78a000/i2c-bus@180/ir35221@71 \
-               bus@1e78a000/i2c-bus@380/tmp275@4a \
+               bus@1e78a000/i2c@100/max31785@52 \
+               bus@1e78a000/i2c@100/power-supply@68 \
+               bus@1e78a000/i2c@100/power-supply@69 \
+               bus@1e78a000/i2c@100/bmp280@77 \
+               bus@1e78a000/i2c@100/dps310@76 \
+               bus@1e78a000/i2c@140/ir35221@70 \
+               bus@1e78a000/i2c@140/ir35221@71 \
+               bus@1e78a000/i2c@180/ir35221@70 \
+               bus@1e78a000/i2c@180/ir35221@71 \
+               bus@1e78a000/i2c@380/tmp275@4a \
                "
 
 CHIPS:witherspoon-tacoma = " \
-               bus@1e78a000/i2c-bus@200/max31785@52 \
-               bus@1e78a000/i2c-bus@200/power-supply@68 \
-               bus@1e78a000/i2c-bus@200/power-supply@69 \
-               bus@1e78a000/i2c-bus@200/bmp280@77 \
-               bus@1e78a000/i2c-bus@200/dps310@76 \
-               bus@1e78a000/i2c-bus@280/ir35221@70 \
-               bus@1e78a000/i2c-bus@280/ir35221@71 \
-               bus@1e78a000/i2c-bus@300/ir35221@70 \
-               bus@1e78a000/i2c-bus@300/ir35221@71 \
-               bus@1e78a000/i2c-bus@500/tmp275@4a \
+               bus@1e78a000/i2c@200/max31785@52 \
+               bus@1e78a000/i2c@200/power-supply@68 \
+               bus@1e78a000/i2c@200/power-supply@69 \
+               bus@1e78a000/i2c@200/bmp280@77 \
+               bus@1e78a000/i2c@200/dps310@76 \
+               bus@1e78a000/i2c@280/ir35221@70 \
+               bus@1e78a000/i2c@280/ir35221@71 \
+               bus@1e78a000/i2c@300/ir35221@70 \
+               bus@1e78a000/i2c@300/ir35221@71 \
+               bus@1e78a000/i2c@500/tmp275@4a \
                "
 
 CHIPS:p10bmc = " \
-               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 \
+               1e78a200.i2c/i2c-3/3-0068 \
+               1e78a200.i2c/i2c-3/3-0069 \
+               1e78a200.i2c/i2c-3/3-006a \
+               1e78a200.i2c/i2c-3/3-006d \
+               1e78a200.i2c/i2c-3/3-006b \
+               1e78a200.i2c/i2c-3/3-005a \
+               1e78a200.i2c/i2c-3/3-005b \
+               1e78a400.i2c/i2c-7/7-0052 \
+               1e78a780.i2c/i2c-14/i2c-30/30-0052 \
                "
 
-ITEMSFMT = "ahb/apb/{0}.conf"
-ITEMSFMT:p10bmc = "devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/{0}.conf"
+ITEMSFMT = "ahb/apb@1e780000/{0}.conf"
+ITEMSFMT:p10bmc = "devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/{0}.conf"
 ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}"
 
 OCCS = " \

diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/pca9541a@70/i2c-arb/hotswap@54.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/pca9541a@70/i2c-arb/hotswap@54.conf
similarity index 100%
rename from meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/pca9541a@70/i2c-arb/hotswap@54.conf
rename to meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/pca9541a@70/i2c-arb/hotswap@54.conf


diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/power-brick@30.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/power-brick@30.conf
similarity index 100%
rename from meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/power-brick@30.conf
rename to meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/power-brick@30.conf


diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/power-brick@6a.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/power-brick@6a.conf
similarity index 100%
rename from meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/power-brick@6a.conf
rename to meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/power-brick@6a.conf


diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@40.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/vrm@40.conf
similarity index 100%
rename from meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@40.conf
rename to meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/vrm@40.conf


diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@41.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/vrm@41.conf
similarity index 100%
rename from meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@41.conf
rename to meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/vrm@41.conf


diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@43.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/vrm@43.conf
similarity index 100%
rename from meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@43.conf
rename to meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/vrm@43.conf


diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@60.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/vrm@60.conf
similarity index 100%
rename from meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@60.conf
rename to meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/vrm@60.conf


diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@64.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/vrm@64.conf
similarity index 100%
rename from meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@64.conf
rename to meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/vrm@64.conf


diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@40.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@340/vrm@40.conf
similarity index 100%
rename from meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@40.conf
rename to meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@340/vrm@40.conf


diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@41.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@340/vrm@41.conf
similarity index 100%
rename from meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@41.conf
rename to meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@340/vrm@41.conf


diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@42.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@340/vrm@42.conf
similarity index 100%
rename from meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@42.conf
rename to meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@340/vrm@42.conf


diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@60.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@340/vrm@60.conf
similarity index 100%
rename from meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@60.conf
rename to meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@340/vrm@60.conf


diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@64.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@340/vrm@64.conf
similarity index 100%
rename from meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@64.conf
rename to meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@340/vrm@64.conf


diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/ucd90160@64.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@40/ucd90160@64.conf
similarity index 100%
rename from meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/ucd90160@64.conf
rename to meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@40/ucd90160@64.conf


diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/pwm-tacho-controller@1e786000.conf
similarity index 100%
rename from meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf
rename to meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/pwm-tacho-controller@1e786000.conf


diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 07b7a38..dcdd6fc 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend

@@ -1,21 +1,21 @@
 FILESEXTRAPATHS:prepend:zaius := "${THISDIR}/${PN}:"
 
-ZAIUS_CHIPS = "bus@1e78a000/i2c-bus@40/ucd90160@64"
-ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/pca9541a@70/i2c-arb/hotswap@54"
+ZAIUS_CHIPS = "bus@1e78a000/i2c@40/ucd90160@64"
+ZAIUS_CHIPS += " bus@1e78a000/i2c@300/pca9541a@70/i2c-arb/hotswap@54"
 ZAIUS_CHIPS += " pwm-tacho-controller@1e786000"
-ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/power-brick@30"
-ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/power-brick@6a"
-ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/vrm@40"
-ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/vrm@41"
-ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/vrm@43"
-ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/vrm@60"
-ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/vrm@64"
-ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@340/vrm@40"
-ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@340/vrm@41"
-ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@340/vrm@42"
-ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@340/vrm@60"
-ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@340/vrm@64"
-ZAIUS_ITEMSFMT = "ahb/apb/{0}.conf"
+ZAIUS_CHIPS += " bus@1e78a000/i2c@300/power-brick@30"
+ZAIUS_CHIPS += " bus@1e78a000/i2c@300/power-brick@6a"
+ZAIUS_CHIPS += " bus@1e78a000/i2c@300/vrm@40"
+ZAIUS_CHIPS += " bus@1e78a000/i2c@300/vrm@41"
+ZAIUS_CHIPS += " bus@1e78a000/i2c@300/vrm@43"
+ZAIUS_CHIPS += " bus@1e78a000/i2c@300/vrm@60"
+ZAIUS_CHIPS += " bus@1e78a000/i2c@300/vrm@64"
+ZAIUS_CHIPS += " bus@1e78a000/i2c@340/vrm@40"
+ZAIUS_CHIPS += " bus@1e78a000/i2c@340/vrm@41"
+ZAIUS_CHIPS += " bus@1e78a000/i2c@340/vrm@42"
+ZAIUS_CHIPS += " bus@1e78a000/i2c@340/vrm@60"
+ZAIUS_CHIPS += " bus@1e78a000/i2c@340/vrm@64"
+ZAIUS_ITEMSFMT = "ahb/apb@1e780000/{0}.conf"
 
 ZAIUS_ITEMS = "${@compose_list(d, 'ZAIUS_ITEMSFMT', 'ZAIUS_CHIPS')}"
 ZAIUS_ITEMS += "iio-hwmon.conf iio-hwmon-battery.conf"

diff --git a/meta-phosphor/recipes-phosphor/video/uart-render-controller/uart-render-controller.service b/meta-phosphor/recipes-phosphor/video/uart-render-controller/uart-render-controller.service
index 0749f12..022d38a 100644
--- a/meta-phosphor/recipes-phosphor/video/uart-render-controller/uart-render-controller.service
+++ b/meta-phosphor/recipes-phosphor/video/uart-render-controller/uart-render-controller.service

@@ -6,8 +6,8 @@
 
 [Service]
 ExecStart=/usr/sbin/obmc-uart-render-controller \
-	  /sys/devices/platform/ahb/ahb:apb/1e6e6000.display/vga_pw \
-	  /sys/devices/platform/ahb/ahb:apb/1e6e6000.display/dac_mux \
+	  /sys/devices/platform/ahb/1e6e0000.apb/1e6e6000.display/vga_pw \
+	  /sys/devices/platform/ahb/1e6e0000.apb/1e6e6000.display/dac_mux \
 	  fbterm.service
 
 [Install]

diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ina219@40.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/ina219@40.conf
similarity index 100%
rename from meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ina219@40.conf
rename to meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/ina219@40.conf


diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ina219@41.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/ina219@41.conf
similarity index 100%
rename from meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ina219@41.conf
rename to meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/ina219@41.conf


diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53622@67.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53622@67.conf
similarity index 100%
rename from meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53622@67.conf
rename to meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53622@67.conf


diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53622@77.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53622@77.conf
similarity index 100%
rename from meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53622@77.conf
rename to meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53622@77.conf


diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53659@62.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53659@62.conf
similarity index 100%
rename from meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53659@62.conf
rename to meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53659@62.conf


diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53659@64.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53659@64.conf
similarity index 100%
rename from meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53659@64.conf
rename to meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53659@64.conf


diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53659@72.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53659@72.conf
similarity index 100%
rename from meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53659@72.conf
rename to meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53659@72.conf


diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53659@74.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53659@74.conf
similarity index 100%
rename from meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53659@74.conf
rename to meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53659@74.conf


diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53679@60.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53679@60.conf
similarity index 100%
rename from meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53679@60.conf
rename to meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53679@60.conf


diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53679@70.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53679@70.conf
similarity index 100%
rename from meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53679@70.conf
rename to meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53679@70.conf


diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/tmp421@4c.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@1c0/tmp421@4c.conf
similarity index 100%
rename from meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/tmp421@4c.conf
rename to meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@1c0/tmp421@4c.conf


diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp421@4c.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@80/tmp421@4c.conf
similarity index 100%
rename from meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp421@4c.conf
rename to meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@80/tmp421@4c.conf


diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 1066cb2..4fca027 100644
--- a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend

@@ -3,18 +3,18 @@
 EXTRA_OEMESON:append:f0b = " -Dnegative-errno-on-fail=true"
 
 NAME = " \
-        bus@1e78a000/i2c-bus@80/tmp421@4c \
-        bus@1e78a000/i2c-bus@1c0/tmp421@4c \
-        bus@1e78a000/i2c-bus@180/tps53679@60\
-        bus@1e78a000/i2c-bus@180/tps53659@62\
-        bus@1e78a000/i2c-bus@180/tps53659@64\
-        bus@1e78a000/i2c-bus@180/tps53679@70\
-        bus@1e78a000/i2c-bus@180/tps53659@72\
-        bus@1e78a000/i2c-bus@180/tps53659@74\
-        bus@1e78a000/i2c-bus@180/ina219@40\
-        bus@1e78a000/i2c-bus@180/ina219@41\
+        bus@1e78a000/i2c@80/tmp421@4c \
+        bus@1e78a000/i2c@1c0/tmp421@4c \
+        bus@1e78a000/i2c@180/tps53679@60\
+        bus@1e78a000/i2c@180/tps53659@62\
+        bus@1e78a000/i2c@180/tps53659@64\
+        bus@1e78a000/i2c@180/tps53679@70\
+        bus@1e78a000/i2c@180/tps53659@72\
+        bus@1e78a000/i2c@180/tps53659@74\
+        bus@1e78a000/i2c@180/ina219@40\
+        bus@1e78a000/i2c@180/ina219@41\
         "
-ITEMSFMT = "ahb/apb/{0}.conf"
+ITEMSFMT = "ahb/apb@1e780000/{0}.conf"
 
 ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAME')}"
 

diff --git a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/init_once.sh b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/init_once.sh
index 08b2880..a89b7af 100755
--- a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/init_once.sh
+++ b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/init_once.sh

@@ -12,7 +12,7 @@
   echo "$2" > "/sys/class/gpio/gpio$1/direction"
 }
 
-GPIO_BASE=$(cat /sys/devices/platform/ahb/ahb:apb/1e780000.gpio/gpio/*/base)
+GPIO_BASE=$(cat /sys/devices/platform/ahb/1e780000.apb/1e780000.gpio/gpio/*/base)
 
 # FM_BMC_READY_N, GPIO Q4, active low
 set_gpio_active_low $((GPIO_BASE + 128 + 4)) high

diff --git a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweroff.sh b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweroff.sh
index 5049f41..ab83c33 100755
--- a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweroff.sh
+++ b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweroff.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-GPIO_BASE=$(cat /sys/devices/platform/ahb/ahb:apb/1e780000.gpio/gpio/*/base)
+GPIO_BASE=$(cat /sys/devices/platform/ahb/1e780000.apb/1e780000.gpio/gpio/*/base)
 GPIO_NUM=$((GPIO_BASE + 24 + 3))
 
 echo 1 > /sys/class/gpio/gpio${GPIO_NUM}/value

diff --git a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweron.sh b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweron.sh
index 2ae70de..3b8c7d5 100755
--- a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweron.sh
+++ b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweron.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-GPIO_BASE=$(cat /sys/devices/platform/ahb/ahb:apb/1e780000.gpio/gpio/*/base)
+GPIO_BASE=$(cat /sys/devices/platform/ahb/1e780000.apb/1e780000.gpio/gpio/*/base)
 GPIO_NUM=$((GPIO_BASE + 24 + 3))
 
 echo 1 > /sys/class/gpio/gpio${GPIO_NUM}/value

diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@0/psu@59.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/i2c-switch@70/i2c@0/psu@59.conf
similarity index 100%
rename from meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@0/psu@59.conf
rename to meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/i2c-switch@70/i2c@0/psu@59.conf


diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@1/psu@58.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/i2c-switch@70/i2c@1/psu@58.conf
similarity index 100%
rename from meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@1/psu@58.conf
rename to meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/i2c-switch@70/i2c@1/psu@58.conf


diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@2/psu@58.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/i2c-switch@70/i2c@2/psu@58.conf
similarity index 100%
rename from meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@2/psu@58.conf
rename to meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/i2c-switch@70/i2c@2/psu@58.conf


diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@3/psu@59.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/i2c-switch@70/i2c@3/psu@59.conf
similarity index 100%
rename from meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@3/psu@59.conf
rename to meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/i2c-switch@70/i2c@3/psu@59.conf


diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4c.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@80/tmp75@4c.conf
similarity index 100%
rename from meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4c.conf
rename to meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@80/tmp75@4c.conf


diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4e.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@80/tmp75@4e.conf
similarity index 100%
rename from meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4e.conf
rename to meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@80/tmp75@4e.conf


diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4f.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@80/tmp75@4f.conf
similarity index 100%
rename from meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4f.conf
rename to meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@80/tmp75@4f.conf


diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/pwm-tacho-controller@1e786000.conf
similarity index 100%
rename from meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf
rename to meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/pwm-tacho-controller@1e786000.conf


diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 16cc272..8b2c348 100644
--- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend

@@ -5,11 +5,11 @@
 # More conf files can be added as sensors are added.
 
 Q71L_PWM = "pwm-tacho-controller@1e786000"
-Q71L_PWM_BASE = "ahb/apb/{0}.conf"
+Q71L_PWM_BASE = "ahb/apb@1e780000/{0}.conf"
 Q71L_ITEMS += "${@compose_list(d, 'Q71L_PWM_BASE', 'Q71L_PWM')}"
 
 Q71L_TEMPS = "tmp75@4c tmp75@4e tmp75@4f"
-Q71L_TEMPBASE = "ahb/apb/bus@1e78a000/i2c-bus@80/{0}.conf"
+Q71L_TEMPBASE = "ahb/apb@1e780000/bus@1e78a000/i2c@80/{0}.conf"
 
 Q71L_ITEMS += "${@compose_list(d, 'Q71L_TEMPBASE', 'Q71L_TEMPS')}"
 
@@ -17,7 +17,7 @@
 Q71L_ITEMS += "iio-hwmon-battery.conf"
 
 Q71L_PSUS = "0/psu@59 1/psu@58 2/psu@58 3/psu@59"
-Q71L_PSUBASE = "ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@{0}.conf"
+Q71L_PSUBASE = "ahb/apb@1e780000/bus@1e78a000/i2c@300/i2c-switch@70/i2c@{0}.conf"
 Q71L_ITEMS += "${@compose_list(d, 'Q71L_PSUBASE', 'Q71L_PSUS')}"
 
 ENVS = "obmc/hwmon/{0}"
commit	a221e432b030563430d1c1b32a6ebc010d3ba505	[log] [tgz]
author	Andrew Jeffery <andrew@codeconstruct.com.au>	Mon Aug 26 11:45:10 2024 +0930
committer	Patrick Williams <patrick@stwcx.xyz>	Tue Sep 03 14:17:35 2024 +0000
tree	8516ec3693075083ac0f5721f93e8dadb82317a5
parent	4e752813c500459eb596f6791240a1e1a082b7c7 [diff]