[Subtree] Bring openbmc machines to top level

The new subtree model brings the subtrees up from the openbmc-machines
layer.

Change-Id: I58a03ae1be374bc79ae1438e65e888375d12d0c0
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

24 files changed, 0 insertions, 348 deletions

diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@12.conf b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@12.conf
deleted file mode 100644
index e968f08e7..000000000
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@12.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-LABEL_temp1=SYS_SOC_TEMP_L
-CRITLO_temp1=0
-CRITHI_temp1=100000
-
-LABEL_temp2=SYS_SOC_TEMP_R
-CRITLO_temp2=0
-CRITHI_temp2=100000
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@42.conf b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@42.conf
deleted file mode 100644
index a1ba06196..000000000
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@42.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL_in1=VREG_5P0
-WARNLO_in1=4758
-WARNHI_in1=5258
-CRITLO_in1=4507
-CRITHI_in1=5509
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@44.conf b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@44.conf
deleted file mode 100644
index 8edf80c69..000000000
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@44.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL_in1=VREG_3P3
-WARNLO_in1=3130
-WARNHI_in1=3474
-CRITLO_in1=2974
-CRITHI_in1=3631
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@46.conf b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@46.conf
deleted file mode 100644
index b083035d3..000000000
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@46.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL_in1=VREG_3P3_AUX
-WARNLO_in1=3130
-WARNHI_in1=3474
-CRITLO_in1=2974
-CRITHI_in1=3631
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@48.conf b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@48.conf
deleted file mode 100644
index fc0896b0f..000000000
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@48.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL_in1=VREG_5P0_USB
-WARNLO_in1=4758
-WARNHI_in1=5258
-CRITLO_in1=4507
-CRITHI_in1=5509
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@02.conf b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@02.conf
deleted file mode 100644
index 91a38eec8..000000000
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@02.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL_in1=PVDDQ_510
-WARNLO_in1=1144
-WARNHI_in1=1264
-CRITLO_in1=1080
-CRITHI_in1=1320
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@04.conf b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@04.conf
deleted file mode 100644
index d86a58890..000000000
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@04.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL_in1=PVDDQ_423
-WARNLO_in1=1144
-WARNHI_in1=1264
-CRITLO_in1=1080
-CRITHI_in1=1320
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/nvt210@4c.conf b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/nvt210@4c.conf
deleted file mode 100644
index e968f08e7..000000000
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/nvt210@4c.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-LABEL_temp1=SYS_SOC_TEMP_L
-CRITLO_temp1=0
-CRITHI_temp1=100000
-
-LABEL_temp2=SYS_SOC_TEMP_R
-CRITLO_temp2=0
-CRITHI_temp2=100000
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1d.conf b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1d.conf
deleted file mode 100644
index 6a0bab548..000000000
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1d.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-LABEL_temp1=SYS_INLET_0_L
-CRITLO_temp1=0
-CRITHI_temp1=50000
-
-LABEL_temp2=SYS_INLET_0_R
-CRITLO_temp2=0
-CRITHI_temp2=50000
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1f.conf b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1f.conf
deleted file mode 100644
index b85648222..000000000
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1f.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL_temp1=SYS_INLET_1
-CRITLO_temp1=0
-CRITHI_temp1=50000
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4d.conf b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4d.conf
deleted file mode 100644
index 2ed024e34..000000000
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4d.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL_temp1=SYS_INLET_2
-CRITLO_temp1=0
-CRITHI_temp1=50000
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4f.conf b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4f.conf
deleted file mode 100644
index ee3b5d5e5..000000000
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4f.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL_temp1=SYS_INLET_3
-CRITLO_temp1=0
-CRITHI_temp1=50000
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@10.conf b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@10.conf
deleted file mode 100644
index 2805cadb2..000000000
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@10.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-LABEL_in1=HSC_AUX_VIN
-WARNLO_in1=11431
-WARNHI_in1=12567
-CRITLO_in1=10792
-CRITHI_in1=13206
-
-LABEL_in2=HSC_AUX_VOUT
-WARNLO_in2=11431
-WARNHI_in2=12567
-CRITLO_in2=10792
-CRITHI_in2=13206
-
-LABEL_curr1=HSC_AUX_IOUT
-WARNLO_curr1=0
-WARNHI_curr1=50058
-CRITLO_curr1=0
-CRITHI_curr1=60021
-
-LABEL_power1=HSC_AUX_PIN
-WARNLO_power1=0
-WARNHI_power1=601520
-CRITLO_power1=0
-CRITHI_power1=721240
-
-LABEL_temp1=HSC_AUX_TEMP
-CRITLO_temp1=0
-CRITHI_temp1=105000
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@11.conf b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@11.conf
deleted file mode 100644
index 3c4ebbae6..000000000
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@11.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-LABEL_in1=HSC_HDD_VIN
-WARNLO_in1=11431
-WARNHI_in1=12567
-CRITLO_in1=10792
-CRITHI_in1=13206
-
-LABEL_in2=HSC_HDD_VOUT
-WARNLO_in2=11431
-WARNHI_in2=12567
-CRITLO_in2=10792
-CRITHI_in2=13206
-
-LABEL_curr1=HSC_HDD_IOUT
-WARNLO_curr1=0
-WARNHI_curr1=11993
-CRITLO_curr1=0
-CRITHI_curr1=15008
-
-LABEL_power1=HSC_HDD_PIN
-WARNLO_power1=0
-WARNHI_power1=143200
-CRITLO_power1=0
-CRITHI_power1=179200
-
-LABEL_temp1=HSC_HDD_TEMP
-CRITLO_temp1=0
-CRITHI_temp1=60000
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/adm1278@12.conf b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/adm1278@12.conf
deleted file mode 100644
index 01b32101d..000000000
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/adm1278@12.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-LABEL_in1=HSC_FAN_VIN
-WARNLO_in1=11431
-WARNHI_in1=12567
-CRITLO_in1=10792
-CRITHI_in1=13206
-
-LABEL_in2=HSC_FAN_VOUT
-WARNLO_in2=11431
-WARNHI_in2=12567
-CRITLO_in2=10792
-CRITHI_in2=13206
-
-LABEL_curr1=HSC_FAN_IOUT
-WARNLO_curr1=0
-WARNHI_curr1=24948
-CRITLO_curr1=0
-CRITHI_curr1=29988
-
-LABEL_power1=HSC_FAN_PIN
-WARNLO_power1=0
-WARNHI_power1=298980
-CRITLO_power1=0
-CRITHI_power1=359380
-
-LABEL_temp1=HSC_FAN_TEMP
-CRITLO_temp1=0
-CRITHI_temp1=105000
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/ds1100@58.conf b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/ds1100@58.conf
deleted file mode 100644
index 5a6fe7ec3..000000000
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/ds1100@58.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-LABEL_fan1=PSU_FAN
-CRITLO_fan1=535
-CRITHI_fan1=13054
-
-LABEL_temp3=PSU_TEMP_AMB
-CRITLO_temp3=0
-CRITHI_temp3=50000
-
-LABEL_temp1=PSU_TEMP_HS
-CRITLO_temp1=0
-CRITHI_temp1=100000
-
-LABEL_in1=PSU_VIN
-WARNLO_in1=96000
-WARNHI_in1=0
-CRITLO_in1=0
-CRITHI_in1=253000
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@20.conf b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@20.conf
deleted file mode 100644
index 1e21d96d6..000000000
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@20.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-LABEL_fan1=SYS_FAN_1_F
-CRITLO_fan1=535
-CRITHI_fan1=26964
-GAIN_fan1=0.85
-OFFSET_fan1=0
-
-LABEL_fan2=SYS_FAN_1_R
-CRITLO_fan2=535
-CRITHI_fan2=26964
-GAIN_fan2=0.8
-OFFSET_fan2=0
-
-LABEL_fan8=SYS_FAN_2_F
-CRITLO_fan8=535
-CRITHI_fan8=26964
-GAIN_fan8=0.85
-OFFSET_fan8=0
-
-LABEL_fan3=SYS_FAN_2_R
-CRITLO_fan3=535
-CRITHI_fan3=26964
-GAIN_fan3=0.8
-OFFSET_fan3=0
-
-LABEL_fan4=SYS_FAN_3_F
-CRITLO_fan4=535
-CRITHI_fan4=26964
-GAIN_fan4=0.85
-OFFSET_fan4=0
-
-LABEL_fan5=SYS_FAN_3_R
-CRITLO_fan5=535
-CRITHI_fan5=26964
-GAIN_fan5=0.8
-OFFSET_fan5=0
-
-LABEL_fan11=SYS_FAN_4_F
-CRITLO_fan11=535
-CRITHI_fan11=26964
-GAIN_fan11=0.85
-OFFSET_fan11=0
-
-LABEL_fan6=SYS_FAN_4_R
-CRITLO_fan6=535
-CRITHI_fan6=26964
-GAIN_fan6=0.8
-OFFSET_fan6=0
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@23.conf b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@23.conf
deleted file mode 100644
index 20dad4b44..000000000
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@23.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-LABEL_fan1=SYS_FAN_5_F
-CRITLO_fan1=535
-CRITHI_fan1=26964
-GAIN_fan1=0.85
-OFFSET_fan1=0
-
-LABEL_fan2=SYS_FAN_5_R
-CRITLO_fan2=535
-CRITHI_fan2=26964
-GAIN_fan2=0.8
-OFFSET_fan2=0
-
-LABEL_fan8=SYS_FAN_6_F
-CRITLO_fan8=535
-CRITHI_fan8=26964
-GAIN_fan8=0.85
-OFFSET_fan8=0
-
-LABEL_fan3=SYS_FAN_6_R
-CRITLO_fan3=535
-CRITHI_fan3=26964
-GAIN_fan3=0.8
-OFFSET_fan3=0
-
-LABEL_fan4=SYS_FAN_7_F
-CRITLO_fan4=535
-CRITHI_fan4=26964
-GAIN_fan4=0.85
-OFFSET_fan4=0
-
-LABEL_fan5=SYS_FAN_7_R
-CRITLO_fan5=535
-CRITHI_fan5=26964
-GAIN_fan5=0.8
-OFFSET_fan5=0
-
-LABEL_fan11=SYS_FAN_8_F
-CRITLO_fan11=535
-CRITHI_fan11=26964
-GAIN_fan11=0.85
-OFFSET_fan11=0
-
-LABEL_fan6=SYS_FAN_8_R
-CRITLO_fan6=535
-CRITHI_fan6=26964
-GAIN_fan6=0.8
-OFFSET_fan6=0
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/tmp421@1d.conf b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/tmp421@1d.conf
deleted file mode 100644
index 1c85be91a..000000000
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/tmp421@1d.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-LABEL_temp1=FAN_BD_TEMP_L
-CRITLO_temp1=0
-CRITHI_temp1=60000
-
-LABEL_temp2=FAN_BD_TEMP_R
-CRITLO_temp2=0
-CRITHI_temp2=60000
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1c.conf b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1c.conf
deleted file mode 100644
index a7e74da32..000000000
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1c.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL_temp1=SYS_OUTLET_3
-CRITLO_temp1=0
-CRITHI_temp1=100000
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1e.conf b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1e.conf
deleted file mode 100644
index 0bb21b236..000000000
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1e.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-LABEL_temp1=SYS_OUTLET_0_L
-CRITLO_temp1=0
-CRITHI_temp1=100000
-
-LABEL_temp2=SYS_OUTLET_0_R
-CRITLO_temp2=0
-CRITHI_temp2=100000
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@2a.conf b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@2a.conf
deleted file mode 100644
index f794c0e7b..000000000
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@2a.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL_temp1=SYS_OUTLET_1
-CRITLO_temp1=0
-CRITHI_temp1=100000
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@4e.conf b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@4e.conf
deleted file mode 100644
index 3834fc2dd..000000000
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@4e.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-LABEL_temp1=SYS_OUTLET_2
-CRITLO_temp1=0
-CRITHI_temp1=100000
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/flash-controller@1e631000/spi2@0.conf b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/flash-controller@1e631000/spi2@0.conf
deleted file mode 100644
index 1311e52bb..000000000
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/flash-controller@1e631000/spi2@0.conf
+++ /dev/null
@@ -1,73 +0,0 @@
-LABEL_temp1=SOC_TEMP
-CRITLO_temp1=0
-CRITHI_temp1=94000
-
-LABEL_temp2=PMF2432_TEMP
-CRITLO_temp2=0
-CRITHI_temp2=103000
-
-LABEL_temp3=PMF2433_TEMP
-CRITLO_temp3=0
-CRITHI_temp3=103000
-
-LABEL_temp4=CVR_APC_TEMP
-CRITLO_temp4=0
-CRITHI_temp4=103000
-
-LABEL_temp5=CVR_CBF_TEMP
-CRITLO_temp5=0
-CRITHI_temp5=103000
-
-LABEL_temp6=DIMM_C0D0_TEMP
-CRITLO_temp6=0
-CRITHI_temp6=83000
-
-LABEL_temp7=DIMM_C0D1_TEMP
-CRITLO_temp7=0
-CRITHI_temp7=83000
-
-LABEL_temp8=DIMM_C1D0_TEMP
-CRITLO_temp8=0
-CRITHI_temp8=83000
-
-LABEL_temp9=DIMM_C1D1_TEMP
-CRITLO_temp9=0
-CRITHI_temp9=83000
-
-LABEL_temp10=DIMM_C2D0_TEMP
-CRITLO_temp10=0
-CRITHI_temp10=83000
-
-LABEL_temp11=DIMM_C2D1_TEMP
-CRITLO_temp11=0
-CRITHI_temp11=83000
-
-LABEL_temp12=DIMM_C3D0_TEMP
-CRITLO_temp12=0
-CRITHI_temp12=83000
-
-LABEL_temp13=DIMM_C3D1_TEMP
-CRITLO_temp13=0
-CRITHI_temp13=83000
-
-LABEL_temp14=DIMM_C4D0_TEMP
-CRITLO_temp14=0
-CRITHI_temp14=83000
-
-LABEL_temp15=DIMM_C4D1_TEMP
-CRITLO_temp15=0
-CRITHI_temp15=83000
-
-LABEL_temp16=DIMM_C5D0_TEMP
-CRITLO_temp16=0
-CRITHI_temp16=83000
-
-LABEL_temp17=DIMM_C5D1_TEMP
-CRITLO_temp17=0
-CRITHI_temp17=83000
-
-LABEL_power1=SOC_PWR
-WARNLO_power1=0
-WARNHI_power1=120000
-CRITLO_power1=0
-CRITHI_power1=130000