diff --git a/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/pwm-tacho-controller@1e786000.conf b/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf
similarity index 100%
rename from meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/pwm-tacho-controller@1e786000.conf
rename to meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf
diff --git a/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 6da5ccb..8632f97 100644
--- a/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -4,7 +4,9 @@
 
 # More conf files can be added as sensors are added.
 
-Q71L_ITEMS = "pwm-tacho-controller@1e786000.conf"
+Q71L_PWM = "pwm-tacho-controller@1e786000"
+Q71L_PWM_BASE = "ahb/apb/{0}.conf"
+Q71L_ITEMS += "${@compose_list(d, 'Q71L_PWM_BASE', 'Q71L_PWM')}"
 
 Q71L_TEMPS = "tmp75@4c tmp75@4e tmp75@4f"
 Q71L_TEMPBASE = "ahb/apb/i2c@1e78a000/i2c-bus@80/{0}.conf"